From b5e75f65d9ed2d723f65d7c7a368766f9c1ca99a Mon Sep 17 00:00:00 2001 From: Jess Frazelle Date: Thu, 4 Jun 2020 18:07:04 -0700 Subject: [PATCH] update Signed-off-by: Jess Frazelle --- certbot/Dockerfile | 2 +- clair/Dockerfile | 2 +- gcloud/Dockerfile | 2 +- latest-versions.sh | 1 + pomerium/Dockerfile | 2 +- telize/Dockerfile | 16 +- telize/country-code3.conf | 251 ++++++++++++++++++ telize/timezone-offset.conf | 485 +++++++++++++++++++++++++++++++++ telize/tz-offset.lua | 515 ++++++++++++++++++++++++++++++++++++ watchtower/Dockerfile | 2 +- znc/Dockerfile | 2 +- 11 files changed, 1268 insertions(+), 12 deletions(-) create mode 100644 telize/country-code3.conf create mode 100644 telize/timezone-offset.conf create mode 100755 telize/tz-offset.lua diff --git a/certbot/Dockerfile b/certbot/Dockerfile index 77e080a..28edf89 100644 --- a/certbot/Dockerfile +++ b/certbot/Dockerfile @@ -7,7 +7,7 @@ RUN apk --no-cache add \ libressl \ python3 -ENV CERTBOT_VERSION 1.4.0 +ENV CERTBOT_VERSION 1.5.0 RUN buildDeps=' \ build-base \ diff --git a/clair/Dockerfile b/clair/Dockerfile index 3f15c99..2f8777d 100644 --- a/clair/Dockerfile +++ b/clair/Dockerfile @@ -10,7 +10,7 @@ ENV GOPATH /go RUN go get github.com/quay/clair/cmd/clair || true -ENV CLAIR_VERSION v2.1.3 +ENV CLAIR_VERSION v2.1.4 WORKDIR /go/src/github.com/quay/clair diff --git a/gcloud/Dockerfile b/gcloud/Dockerfile index ca35e36..43b85a9 100644 --- a/gcloud/Dockerfile +++ b/gcloud/Dockerfile @@ -1,7 +1,7 @@ FROM python:2-alpine ENV PATH $PATH:/usr/src/google-cloud-sdk/bin -ENV CLOUD_SDK_DOCKER_VERSION 294.0.0 +ENV CLOUD_SDK_DOCKER_VERSION 295.0.0 RUN set -x \ && apk add --no-cache --virtual .build-deps \ diff --git a/latest-versions.sh b/latest-versions.sh index 644e952..c0ae54d 100755 --- a/latest-versions.sh +++ b/latest-versions.sh @@ -144,6 +144,7 @@ projects=( tarsnap/tarsnap nginx/nginx simplresty/ngx_devel_kit + openresty/luajit2 openresty/lua-nginx-module leev/ngx_http_geoip2_module maxmind/libmaxminddb diff --git a/pomerium/Dockerfile b/pomerium/Dockerfile index 5cb8070..878ed9e 100644 --- a/pomerium/Dockerfile +++ b/pomerium/Dockerfile @@ -9,7 +9,7 @@ RUN apk --no-cache add \ ENV PATH /go/bin:/usr/local/go/bin:$PATH ENV GOPATH /go -ENV POMERIUM_VERSION v0.8.3 +ENV POMERIUM_VERSION v0.9.0 RUN go get github.com/pomerium/pomerium || true \ && cd /go/src/github.com/pomerium/pomerium \ diff --git a/telize/Dockerfile b/telize/Dockerfile index d8f8ba5..d7df6fc 100644 --- a/telize/Dockerfile +++ b/telize/Dockerfile @@ -1,10 +1,6 @@ FROM alpine:latest -RUN apk add --no-cache \ - lua5.1-cjson \ - luajit - -ENV NGINX_VERSION 1.18.0 +ENV NGINX_VERSION 1.19.0 # https://github.com/simplresty/ngx_devel_kit/releases ENV NGX_DEVEL_KIT_VERSION v0.3.1rc1 # https://github.com/openresty/lua-nginx-module/releases @@ -17,8 +13,10 @@ ENV LIBMAXMINDDB_VERSION 1.4.2 ENV LUA_RESTY_CORE_VERSION v0.1.18rc4 # https://github.com/openresty/lua-resty-lrucache/releases ENV LUA_RESTY_LRUCACHE_VERSION v0.10rc1 +# https://github.com/openresty/luajit2/releases +ENV LUAJIT2_VERSION v2.1.0-beta3 -# Tell nginx's build system where to find LuaJIT 2.1: +# Tell nginx's build system where to find LuaJIT 2: ENV LUAJIT_LIB=/usr/lib/ ENV LUAJIT_INC=/usr/include/luajit-2.1/ @@ -96,6 +94,12 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \ && git clone --depth 1 --branch "${NGX_DEVEL_KIT_VERSION}" https://github.com/simplresty/ngx_devel_kit.git /usr/src/ngx_devel_kit \ && git clone --depth 1 --branch "${LUA_NGINX_MODULE_VERSION}" https://github.com/openresty/lua-nginx-module.git /usr/src/lua-nginx-module \ && git clone --depth 1 --branch "${NGX_HTTP_GEOIP2_MODULE_VERSION}" https://github.com/leev/ngx_http_geoip2_module.git /usr/src/ngx_http_geoip2_module \ + && git clone --depth 1 --branch "${LUAJIT2_VERSION}" https://github.com/openresty/luajit2.git /usr/src/luajit2 \ + && ( \ + cd /usr/src/luajit2 \ + && make \ + && make install \ + ) \ && git clone --depth 1 --branch "${LUA_RESTY_CORE_VERSION}" https://github.com/openresty/lua-resty-core.git /usr/src/lua-resty-core \ && ( \ cd /usr/src/lua-resty-core \ diff --git a/telize/country-code3.conf b/telize/country-code3.conf new file mode 100644 index 0000000..e66a5d5 --- /dev/null +++ b/telize/country-code3.conf @@ -0,0 +1,251 @@ +map $geoip2_country_code $geoip2_country_code3 { + "AD" "AND"; + "AE" "ARE"; + "AF" "AFG"; + "AG" "ATG"; + "AI" "AIA"; + "AL" "ALB"; + "AM" "ARM"; + "AO" "AGO"; + "AQ" "ATA"; + "AR" "ARG"; + "AS" "ASM"; + "AT" "AUT"; + "AU" "AUS"; + "AW" "ABW"; + "AX" "ALA"; + "AZ" "AZE"; + "BA" "BIH"; + "BB" "BRB"; + "BD" "BGD"; + "BE" "BEL"; + "BF" "BFA"; + "BG" "BGR"; + "BH" "BHR"; + "BI" "BDI"; + "BJ" "BEN"; + "BL" "BLM"; + "BM" "BMU"; + "BN" "BRN"; + "BO" "BOL"; + "BQ" "BES"; + "BR" "BRA"; + "BS" "BHS"; + "BT" "BTN"; + "BV" "BVT"; + "BW" "BWA"; + "BY" "BLR"; + "BZ" "BLZ"; + "CA" "CAN"; + "CC" "CCK"; + "CD" "COD"; + "CF" "CAF"; + "CG" "COG"; + "CH" "CHE"; + "CI" "CIV"; + "CK" "COK"; + "CL" "CHL"; + "CM" "CMR"; + "CN" "CHN"; + "CO" "COL"; + "CR" "CRI"; + "CU" "CUB"; + "CV" "CPV"; + "CW" "CUW"; + "CX" "CXR"; + "CY" "CYP"; + "CZ" "CZE"; + "DE" "DEU"; + "DJ" "DJI"; + "DK" "DNK"; + "DM" "DMA"; + "DO" "DOM"; + "DZ" "DZA"; + "EC" "ECU"; + "EE" "EST"; + "EG" "EGY"; + "EH" "ESH"; + "ER" "ERI"; + "ES" "ESP"; + "ET" "ETH"; + "FI" "FIN"; + "FJ" "FJI"; + "FK" "FLK"; + "FM" "FSM"; + "FO" "FRO"; + "FR" "FRA"; + "GA" "GAB"; + "GB" "GBR"; + "GD" "GRD"; + "GE" "GEO"; + "GF" "GUF"; + "GG" "GGY"; + "GH" "GHA"; + "GI" "GIB"; + "GL" "GRL"; + "GM" "GMB"; + "GN" "GIN"; + "GP" "GLP"; + "GQ" "GNQ"; + "GR" "GRC"; + "GS" "SGS"; + "GT" "GTM"; + "GU" "GUM"; + "GW" "GNB"; + "GY" "GUY"; + "HK" "HKG"; + "HM" "HMD"; + "HN" "HND"; + "HR" "HRV"; + "HT" "HTI"; + "HU" "HUN"; + "ID" "IDN"; + "IE" "IRL"; + "IL" "ISR"; + "IM" "IMN"; + "IN" "IND"; + "IO" "IOT"; + "IQ" "IRQ"; + "IR" "IRN"; + "IS" "ISL"; + "IT" "ITA"; + "JE" "JEY"; + "JM" "JAM"; + "JO" "JOR"; + "JP" "JPN"; + "KE" "KEN"; + "KG" "KGZ"; + "KH" "KHM"; + "KI" "KIR"; + "KM" "COM"; + "KN" "KNA"; + "KP" "PRK"; + "KR" "KOR"; + "KW" "KWT"; + "KY" "CYM"; + "KZ" "KAZ"; + "LA" "LAO"; + "LB" "LBN"; + "LC" "LCA"; + "LI" "LIE"; + "LK" "LKA"; + "LR" "LBR"; + "LS" "LSO"; + "LT" "LTU"; + "LU" "LUX"; + "LV" "LVA"; + "LY" "LBY"; + "MA" "MAR"; + "MC" "MCO"; + "MD" "MDA"; + "ME" "MNE"; + "MF" "MAF"; + "MG" "MDG"; + "MH" "MHL"; + "MK" "MKD"; + "ML" "MLI"; + "MM" "MMR"; + "MN" "MNG"; + "MO" "MAC"; + "MP" "MNP"; + "MQ" "MTQ"; + "MR" "MRT"; + "MS" "MSR"; + "MT" "MLT"; + "MU" "MUS"; + "MV" "MDV"; + "MW" "MWI"; + "MX" "MEX"; + "MY" "MYS"; + "MZ" "MOZ"; + "NA" "NAM"; + "NC" "NCL"; + "NE" "NER"; + "NF" "NFK"; + "NG" "NGA"; + "NI" "NIC"; + "NL" "NLD"; + "NO" "NOR"; + "NP" "NPL"; + "NR" "NRU"; + "NU" "NIU"; + "NZ" "NZL"; + "OM" "OMN"; + "PA" "PAN"; + "PE" "PER"; + "PF" "PYF"; + "PG" "PNG"; + "PH" "PHL"; + "PK" "PAK"; + "PL" "POL"; + "PM" "SPM"; + "PN" "PCN"; + "PR" "PRI"; + "PS" "PSE"; + "PT" "PRT"; + "PW" "PLW"; + "PY" "PRY"; + "QA" "QAT"; + "RE" "REU"; + "RO" "ROU"; + "RS" "SRB"; + "RU" "RUS"; + "RW" "RWA"; + "SA" "SAU"; + "SB" "SLB"; + "SC" "SYC"; + "SD" "SDN"; + "SE" "SWE"; + "SG" "SGP"; + "SH" "SHN"; + "SI" "SVN"; + "SJ" "SJM"; + "SK" "SVK"; + "SL" "SLE"; + "SM" "SMR"; + "SN" "SEN"; + "SO" "SOM"; + "SR" "SUR"; + "SS" "SSD"; + "ST" "STP"; + "SV" "SLV"; + "SX" "SXM"; + "SY" "SYR"; + "SZ" "SWZ"; + "TC" "TCA"; + "TD" "TCD"; + "TF" "ATF"; + "TG" "TGO"; + "TH" "THA"; + "TJ" "TJK"; + "TK" "TKL"; + "TL" "TLS"; + "TM" "TKM"; + "TN" "TUN"; + "TO" "TON"; + "TR" "TUR"; + "TT" "TTO"; + "TV" "TUV"; + "TW" "TWN"; + "TZ" "TZA"; + "UA" "UKR"; + "UG" "UGA"; + "UM" "UMI"; + "US" "USA"; + "UY" "URY"; + "UZ" "UZB"; + "VA" "VAT"; + "VC" "VCT"; + "VE" "VEN"; + "VG" "VGB"; + "VI" "VIR"; + "VN" "VNM"; + "VU" "VUT"; + "WF" "WLF"; + "WS" "WSM"; + "YE" "YEM"; + "YT" "MYT"; + "ZA" "ZAF"; + "ZM" "ZMB"; + "ZW" "ZWE"; +} diff --git a/telize/timezone-offset.conf b/telize/timezone-offset.conf new file mode 100644 index 0000000..b6198f5 --- /dev/null +++ b/telize/timezone-offset.conf @@ -0,0 +1,485 @@ +map $geoip2_timezone $geoip2_offset { + "Africa/Abidjan" 0; + "Africa/Accra" 0; + "Africa/Addis_Ababa" 10800; + "Africa/Algiers" 3600; + "Africa/Asmara" 10800; + "Africa/Asmera" 10800; + "Africa/Bamako" 0; + "Africa/Bangui" 3600; + "Africa/Banjul" 0; + "Africa/Bissau" 0; + "Africa/Blantyre" 7200; + "Africa/Brazzaville" 3600; + "Africa/Bujumbura" 7200; + "Africa/Cairo" 7200; + "Africa/Casablanca" 0; + "Africa/Ceuta" 3600; + "Africa/Conakry" 0; + "Africa/Dakar" 0; + "Africa/Dar_es_Salaam" 10800; + "Africa/Djibouti" 10800; + "Africa/Douala" 3600; + "Africa/El_Aaiun" 0; + "Africa/Freetown" 0; + "Africa/Gaborone" 7200; + "Africa/Harare" 7200; + "Africa/Johannesburg" 7200; + "Africa/Juba" 10800; + "Africa/Kampala" 10800; + "Africa/Khartoum" 7200; + "Africa/Kigali" 7200; + "Africa/Kinshasa" 3600; + "Africa/Lagos" 3600; + "Africa/Libreville" 3600; + "Africa/Lome" 0; + "Africa/Luanda" 3600; + "Africa/Lubumbashi" 7200; + "Africa/Lusaka" 7200; + "Africa/Malabo" 3600; + "Africa/Maputo" 7200; + "Africa/Maseru" 7200; + "Africa/Mbabane" 7200; + "Africa/Mogadishu" 10800; + "Africa/Monrovia" 0; + "Africa/Nairobi" 10800; + "Africa/Ndjamena" 3600; + "Africa/Niamey" 3600; + "Africa/Nouakchott" 0; + "Africa/Ouagadougou" 0; + "Africa/Porto-Novo" 3600; + "Africa/Sao_Tome" 3600; + "Africa/Timbuktu" 0; + "Africa/Tripoli" 7200; + "Africa/Tunis" 3600; + "Africa/Windhoek" 7200; + "America/Adak" -36000; + "America/Anchorage" -32400; + "America/Anguilla" -14400; + "America/Antigua" -14400; + "America/Araguaina" -10800; + "America/Argentina/Buenos_Aires" -10800; + "America/Argentina/Catamarca" -10800; + "America/Argentina/ComodRivadavia" -10800; + "America/Argentina/Cordoba" -10800; + "America/Argentina/Jujuy" -10800; + "America/Argentina/La_Rioja" -10800; + "America/Argentina/Mendoza" -10800; + "America/Argentina/Rio_Gallegos" -10800; + "America/Argentina/Salta" -10800; + "America/Argentina/San_Juan" -10800; + "America/Argentina/San_Luis" -10800; + "America/Argentina/Tucuman" -10800; + "America/Argentina/Ushuaia" -10800; + "America/Aruba" -14400; + "America/Asuncion" -10800; + "America/Atikokan" -18000; + "America/Atka" -36000; + "America/Bahia" -10800; + "America/Bahia_Banderas" -21600; + "America/Barbados" -14400; + "America/Belem" -10800; + "America/Belize" -21600; + "America/Blanc-Sablon" -14400; + "America/Boa_Vista" -14400; + "America/Bogota" -18000; + "America/Boise" -25200; + "America/Buenos_Aires" -10800; + "America/Cambridge_Bay" -25200; + "America/Campo_Grande" -14400; + "America/Cancun" -18000; + "America/Caracas" -14400; + "America/Catamarca" -10800; + "America/Cayenne" -10800; + "America/Cayman" -18000; + "America/Chicago" -21600; + "America/Chihuahua" -25200; + "America/Coral_Harbour" -18000; + "America/Cordoba" -10800; + "America/Costa_Rica" -21600; + "America/Creston" -25200; + "America/Cuiaba" -14400; + "America/Curacao" -14400; + "America/Danmarkshavn" 0; + "America/Dawson" -28800; + "America/Dawson_Creek" -25200; + "America/Denver" -25200; + "America/Detroit" -18000; + "America/Dominica" -14400; + "America/Edmonton" -25200; + "America/Eirunepe" -18000; + "America/El_Salvador" -21600; + "America/Ensenada" -28800; + "America/Fort_Nelson" -25200; + "America/Fort_Wayne" -18000; + "America/Fortaleza" -10800; + "America/Glace_Bay" -14400; + "America/Godthab" -10800; + "America/Goose_Bay" -14400; + "America/Grand_Turk" -14400; + "America/Grenada" -14400; + "America/Guadeloupe" -14400; + "America/Guatemala" -21600; + "America/Guayaquil" -18000; + "America/Guyana" -14400; + "America/Halifax" -14400; + "America/Havana" -18000; + "America/Hermosillo" -25200; + "America/Indiana/Indianapolis" -18000; + "America/Indiana/Knox" -21600; + "America/Indiana/Marengo" -18000; + "America/Indiana/Petersburg" -18000; + "America/Indiana/Tell_City" -21600; + "America/Indiana/Vevay" -18000; + "America/Indiana/Vincennes" -18000; + "America/Indiana/Winamac" -18000; + "America/Indianapolis" -18000; + "America/Inuvik" -25200; + "America/Iqaluit" -18000; + "America/Jamaica" -18000; + "America/Jujuy" -10800; + "America/Juneau" -32400; + "America/Kentucky/Louisville" -18000; + "America/Kentucky/Monticello" -18000; + "America/Knox_IN" -21600; + "America/Kralendijk" -14400; + "America/La_Paz" -14400; + "America/Lima" -18000; + "America/Los_Angeles" -28800; + "America/Louisville" -18000; + "America/Lower_Princes" -14400; + "America/Maceio" -10800; + "America/Managua" -21600; + "America/Manaus" -14400; + "America/Marigot" -14400; + "America/Martinique" -14400; + "America/Matamoros" -21600; + "America/Mazatlan" -25200; + "America/Mendoza" -10800; + "America/Menominee" -21600; + "America/Merida" -21600; + "America/Metlakatla" -32400; + "America/Mexico_City" -21600; + "America/Miquelon" -10800; + "America/Moncton" -14400; + "America/Monterrey" -21600; + "America/Montevideo" -10800; + "America/Montreal" -18000; + "America/Montserrat" -14400; + "America/Nassau" -18000; + "America/New_York" -18000; + "America/Nipigon" -18000; + "America/Nome" -32400; + "America/Noronha" -7200; + "America/North_Dakota/Beulah" -21600; + "America/North_Dakota/Center" -21600; + "America/North_Dakota/New_Salem" -21600; + "America/Ojinaga" -25200; + "America/Panama" -18000; + "America/Pangnirtung" -18000; + "America/Paramaribo" -10800; + "America/Phoenix" -25200; + "America/Port-au-Prince" -18000; + "America/Port_of_Spain" -14400; + "America/Porto_Acre" -18000; + "America/Porto_Velho" -14400; + "America/Puerto_Rico" -14400; + "America/Punta_Arenas" -10800; + "America/Rainy_River" -21600; + "America/Rankin_Inlet" -21600; + "America/Recife" -10800; + "America/Regina" -21600; + "America/Resolute" -21600; + "America/Rio_Branco" -18000; + "America/Rosario" -10800; + "America/Santa_Isabel" -28800; + "America/Santarem" -10800; + "America/Santiago" -10800; + "America/Santo_Domingo" -14400; + "America/Sao_Paulo" -10800; + "America/Scoresbysund" -3600; + "America/Shiprock" -25200; + "America/Sitka" -32400; + "America/St_Barthelemy" -14400; + "America/St_Johns" -12600; + "America/St_Kitts" -14400; + "America/St_Lucia" -14400; + "America/St_Thomas" -14400; + "America/St_Vincent" -14400; + "America/Swift_Current" -21600; + "America/Tegucigalpa" -21600; + "America/Thule" -14400; + "America/Thunder_Bay" -18000; + "America/Tijuana" -28800; + "America/Toronto" -18000; + "America/Tortola" -14400; + "America/Vancouver" -28800; + "America/Virgin" -14400; + "America/Whitehorse" -28800; + "America/Winnipeg" -21600; + "America/Yakutat" -32400; + "America/Yellowknife" -25200; + "Antarctica/Casey" 39600; + "Antarctica/Davis" 25200; + "Antarctica/DumontDUrville" 36000; + "Antarctica/Macquarie" 39600; + "Antarctica/Mawson" 18000; + "Antarctica/McMurdo" 46800; + "Antarctica/Palmer" -10800; + "Antarctica/Rothera" -10800; + "Antarctica/South_Pole" 46800; + "Antarctica/Syowa" 10800; + "Antarctica/Troll" 0; + "Antarctica/Vostok" 21600; + "Arctic/Longyearbyen" 3600; + "Asia/Aden" 10800; + "Asia/Almaty" 21600; + "Asia/Amman" 7200; + "Asia/Anadyr" 43200; + "Asia/Aqtau" 18000; + "Asia/Aqtobe" 18000; + "Asia/Ashgabat" 18000; + "Asia/Ashkhabad" 18000; + "Asia/Atyrau" 18000; + "Asia/Baghdad" 10800; + "Asia/Bahrain" 10800; + "Asia/Baku" 14400; + "Asia/Bangkok" 25200; + "Asia/Barnaul" 25200; + "Asia/Beirut" 7200; + "Asia/Bishkek" 21600; + "Asia/Brunei" 28800; + "Asia/Calcutta" 19800; + "Asia/Chita" 32400; + "Asia/Choibalsan" 28800; + "Asia/Chongqing" 28800; + "Asia/Chungking" 28800; + "Asia/Colombo" 19800; + "Asia/Dacca" 21600; + "Asia/Damascus" 7200; + "Asia/Dhaka" 21600; + "Asia/Dili" 32400; + "Asia/Dubai" 14400; + "Asia/Dushanbe" 18000; + "Asia/Famagusta" 7200; + "Asia/Gaza" 7200; + "Asia/Harbin" 28800; + "Asia/Hebron" 7200; + "Asia/Ho_Chi_Minh" 25200; + "Asia/Hong_Kong" 28800; + "Asia/Hovd" 25200; + "Asia/Irkutsk" 28800; + "Asia/Istanbul" 10800; + "Asia/Jakarta" 25200; + "Asia/Jayapura" 32400; + "Asia/Jerusalem" 7200; + "Asia/Kabul" 16200; + "Asia/Kamchatka" 43200; + "Asia/Karachi" 18000; + "Asia/Kashgar" 21600; + "Asia/Kathmandu" 20700; + "Asia/Katmandu" 20700; + "Asia/Khandyga" 32400; + "Asia/Kolkata" 19800; + "Asia/Krasnoyarsk" 25200; + "Asia/Kuala_Lumpur" 28800; + "Asia/Kuching" 28800; + "Asia/Kuwait" 10800; + "Asia/Macao" 28800; + "Asia/Macau" 28800; + "Asia/Magadan" 39600; + "Asia/Makassar" 28800; + "Asia/Manila" 28800; + "Asia/Muscat" 14400; + "Asia/Nicosia" 7200; + "Asia/Novokuznetsk" 25200; + "Asia/Novosibirsk" 25200; + "Asia/Omsk" 21600; + "Asia/Oral" 18000; + "Asia/Phnom_Penh" 25200; + "Asia/Pontianak" 25200; + "Asia/Pyongyang" 30600; + "Asia/Qatar" 10800; + "Asia/Qyzylorda" 21600; + "Asia/Rangoon" 23400; + "Asia/Riyadh" 10800; + "Asia/Saigon" 25200; + "Asia/Sakhalin" 39600; + "Asia/Samarkand" 18000; + "Asia/Seoul" 32400; + "Asia/Shanghai" 28800; + "Asia/Singapore" 28800; + "Asia/Srednekolymsk" 39600; + "Asia/Taipei" 28800; + "Asia/Tashkent" 18000; + "Asia/Tbilisi" 14400; + "Asia/Tehran" 12600; + "Asia/Tel_Aviv" 7200; + "Asia/Thimbu" 21600; + "Asia/Thimphu" 21600; + "Asia/Tokyo" 32400; + "Asia/Tomsk" 25200; + "Asia/Ujung_Pandang" 28800; + "Asia/Ulaanbaatar" 28800; + "Asia/Ulan_Bator" 28800; + "Asia/Urumqi" 21600; + "Asia/Ust-Nera" 36000; + "Asia/Vientiane" 25200; + "Asia/Vladivostok" 36000; + "Asia/Yakutsk" 32400; + "Asia/Yangon" 23400; + "Asia/Yekaterinburg" 18000; + "Asia/Yerevan" 14400; + "Atlantic/Azores" -3600; + "Atlantic/Bermuda" -14400; + "Atlantic/Canary" 0; + "Atlantic/Cape_Verde" -3600; + "Atlantic/Faeroe" 0; + "Atlantic/Faroe" 0; + "Atlantic/Jan_Mayen" 3600; + "Atlantic/Madeira" 0; + "Atlantic/Reykjavik" 0; + "Atlantic/South_Georgia" -7200; + "Atlantic/St_Helena" 0; + "Atlantic/Stanley" -10800; + "Australia/ACT" 39600; + "Australia/Adelaide" 37800; + "Australia/Brisbane" 36000; + "Australia/Broken_Hill" 37800; + "Australia/Canberra" 39600; + "Australia/Currie" 39600; + "Australia/Darwin" 34200; + "Australia/Eucla" 31500; + "Australia/Hobart" 39600; + "Australia/LHI" 39600; + "Australia/Lindeman" 36000; + "Australia/Lord_Howe" 39600; + "Australia/Melbourne" 39600; + "Australia/NSW" 39600; + "Australia/North" 34200; + "Australia/Perth" 28800; + "Australia/Queensland" 36000; + "Australia/South" 37800; + "Australia/Sydney" 39600; + "Australia/Tasmania" 39600; + "Australia/Victoria" 39600; + "Australia/West" 28800; + "Australia/Yancowinna" 37800; + "Europe/Amsterdam" 3600; + "Europe/Andorra" 3600; + "Europe/Astrakhan" 14400; + "Europe/Athens" 7200; + "Europe/Belfast" 0; + "Europe/Belgrade" 3600; + "Europe/Berlin" 3600; + "Europe/Bratislava" 3600; + "Europe/Brussels" 3600; + "Europe/Bucharest" 7200; + "Europe/Budapest" 3600; + "Europe/Busingen" 3600; + "Europe/Chisinau" 7200; + "Europe/Copenhagen" 3600; + "Europe/Dublin" 0; + "Europe/Gibraltar" 3600; + "Europe/Guernsey" 0; + "Europe/Helsinki" 7200; + "Europe/Isle_of_Man" 0; + "Europe/Istanbul" 10800; + "Europe/Jersey" 0; + "Europe/Kaliningrad" 7200; + "Europe/Kiev" 7200; + "Europe/Kirov" 10800; + "Europe/Lisbon" 0; + "Europe/Ljubljana" 3600; + "Europe/London" 0; + "Europe/Luxembourg" 3600; + "Europe/Madrid" 3600; + "Europe/Malta" 3600; + "Europe/Mariehamn" 7200; + "Europe/Minsk" 10800; + "Europe/Monaco" 3600; + "Europe/Moscow" 10800; + "Europe/Nicosia" 7200; + "Europe/Oslo" 3600; + "Europe/Paris" 3600; + "Europe/Podgorica" 3600; + "Europe/Prague" 3600; + "Europe/Riga" 7200; + "Europe/Rome" 3600; + "Europe/Samara" 14400; + "Europe/San_Marino" 3600; + "Europe/Sarajevo" 3600; + "Europe/Saratov" 14400; + "Europe/Simferopol" 10800; + "Europe/Skopje" 3600; + "Europe/Sofia" 7200; + "Europe/Stockholm" 3600; + "Europe/Tallinn" 7200; + "Europe/Tirane" 3600; + "Europe/Tiraspol" 7200; + "Europe/Ulyanovsk" 14400; + "Europe/Uzhgorod" 7200; + "Europe/Vaduz" 3600; + "Europe/Vatican" 3600; + "Europe/Vienna" 3600; + "Europe/Vilnius" 7200; + "Europe/Volgograd" 10800; + "Europe/Warsaw" 3600; + "Europe/Zagreb" 3600; + "Europe/Zaporozhye" 7200; + "Europe/Zurich" 3600; + "Indian/Antananarivo" 10800; + "Indian/Chagos" 21600; + "Indian/Christmas" 25200; + "Indian/Cocos" 23400; + "Indian/Comoro" 10800; + "Indian/Kerguelen" 18000; + "Indian/Mahe" 14400; + "Indian/Maldives" 18000; + "Indian/Mauritius" 14400; + "Indian/Mayotte" 10800; + "Indian/Reunion" 14400; + "Pacific/Apia" 50400; + "Pacific/Auckland" 46800; + "Pacific/Bougainville" 39600; + "Pacific/Chatham" 49500; + "Pacific/Chuuk" 36000; + "Pacific/Easter" -18000; + "Pacific/Efate" 39600; + "Pacific/Enderbury" 46800; + "Pacific/Fakaofo" 46800; + "Pacific/Fiji" 43200; + "Pacific/Funafuti" 43200; + "Pacific/Galapagos" -21600; + "Pacific/Gambier" -32400; + "Pacific/Guadalcanal" 39600; + "Pacific/Guam" 36000; + "Pacific/Honolulu" -36000; + "Pacific/Johnston" -36000; + "Pacific/Kiritimati" 50400; + "Pacific/Kosrae" 39600; + "Pacific/Kwajalein" 43200; + "Pacific/Majuro" 43200; + "Pacific/Marquesas" -34200; + "Pacific/Midway" -39600; + "Pacific/Nauru" 43200; + "Pacific/Niue" -39600; + "Pacific/Norfolk" 39600; + "Pacific/Noumea" 39600; + "Pacific/Pago_Pago" -39600; + "Pacific/Palau" 32400; + "Pacific/Pitcairn" -28800; + "Pacific/Pohnpei" 39600; + "Pacific/Ponape" 39600; + "Pacific/Port_Moresby" 36000; + "Pacific/Rarotonga" -36000; + "Pacific/Saipan" 36000; + "Pacific/Samoa" -39600; + "Pacific/Tahiti" -36000; + "Pacific/Tarawa" 43200; + "Pacific/Tongatapu" 46800; + "Pacific/Truk" 36000; + "Pacific/Wake" 43200; + "Pacific/Wallis" 43200; + "Pacific/Yap" 36000; +} diff --git a/telize/tz-offset.lua b/telize/tz-offset.lua new file mode 100755 index 0000000..74c3ed7 --- /dev/null +++ b/telize/tz-offset.lua @@ -0,0 +1,515 @@ +#!/usr/bin/env lua +--[[ +############################################################################### +# # +# Telize 2.0.0 # +# Copyright (c) 2013-2018, Frederic Cambus # +# https://www.telize.com # +# # +# Created: 2013-08-15 # +# Last Updated: 2018-03-15 # +# # +# Telize is released under the BSD 2-Clause license. # +# See LICENSE file for details. # +# # +############################################################################### +]]-- + +local luatz = require "luatz" + +local timezones = { + "Africa/Abidjan", + "Africa/Accra", + "Africa/Addis_Ababa", + "Africa/Algiers", + "Africa/Asmara", + "Africa/Asmera", + "Africa/Bamako", + "Africa/Bangui", + "Africa/Banjul", + "Africa/Bissau", + "Africa/Blantyre", + "Africa/Brazzaville", + "Africa/Bujumbura", + "Africa/Cairo", + "Africa/Casablanca", + "Africa/Ceuta", + "Africa/Conakry", + "Africa/Dakar", + "Africa/Dar_es_Salaam", + "Africa/Djibouti", + "Africa/Douala", + "Africa/El_Aaiun", + "Africa/Freetown", + "Africa/Gaborone", + "Africa/Harare", + "Africa/Johannesburg", + "Africa/Juba", + "Africa/Kampala", + "Africa/Khartoum", + "Africa/Kigali", + "Africa/Kinshasa", + "Africa/Lagos", + "Africa/Libreville", + "Africa/Lome", + "Africa/Luanda", + "Africa/Lubumbashi", + "Africa/Lusaka", + "Africa/Malabo", + "Africa/Maputo", + "Africa/Maseru", + "Africa/Mbabane", + "Africa/Mogadishu", + "Africa/Monrovia", + "Africa/Nairobi", + "Africa/Ndjamena", + "Africa/Niamey", + "Africa/Nouakchott", + "Africa/Ouagadougou", + "Africa/Porto-Novo", + "Africa/Sao_Tome", + "Africa/Timbuktu", + "Africa/Tripoli", + "Africa/Tunis", + "Africa/Windhoek", + "America/Adak", + "America/Anchorage", + "America/Anguilla", + "America/Antigua", + "America/Araguaina", + "America/Argentina/Buenos_Aires", + "America/Argentina/Catamarca", + "America/Argentina/ComodRivadavia", + "America/Argentina/Cordoba", + "America/Argentina/Jujuy", + "America/Argentina/La_Rioja", + "America/Argentina/Mendoza", + "America/Argentina/Rio_Gallegos", + "America/Argentina/Salta", + "America/Argentina/San_Juan", + "America/Argentina/San_Luis", + "America/Argentina/Tucuman", + "America/Argentina/Ushuaia", + "America/Aruba", + "America/Asuncion", + "America/Atikokan", + "America/Atka", + "America/Bahia", + "America/Bahia_Banderas", + "America/Barbados", + "America/Belem", + "America/Belize", + "America/Blanc-Sablon", + "America/Boa_Vista", + "America/Bogota", + "America/Boise", + "America/Buenos_Aires", + "America/Cambridge_Bay", + "America/Campo_Grande", + "America/Cancun", + "America/Caracas", + "America/Catamarca", + "America/Cayenne", + "America/Cayman", + "America/Chicago", + "America/Chihuahua", + "America/Coral_Harbour", + "America/Cordoba", + "America/Costa_Rica", + "America/Creston", + "America/Cuiaba", + "America/Curacao", + "America/Danmarkshavn", + "America/Dawson", + "America/Dawson_Creek", + "America/Denver", + "America/Detroit", + "America/Dominica", + "America/Edmonton", + "America/Eirunepe", + "America/El_Salvador", + "America/Ensenada", + "America/Fort_Nelson", + "America/Fort_Wayne", + "America/Fortaleza", + "America/Glace_Bay", + "America/Godthab", + "America/Goose_Bay", + "America/Grand_Turk", + "America/Grenada", + "America/Guadeloupe", + "America/Guatemala", + "America/Guayaquil", + "America/Guyana", + "America/Halifax", + "America/Havana", + "America/Hermosillo", + "America/Indiana/Indianapolis", + "America/Indiana/Knox", + "America/Indiana/Marengo", + "America/Indiana/Petersburg", + "America/Indiana/Tell_City", + "America/Indiana/Vevay", + "America/Indiana/Vincennes", + "America/Indiana/Winamac", + "America/Indianapolis", + "America/Inuvik", + "America/Iqaluit", + "America/Jamaica", + "America/Jujuy", + "America/Juneau", + "America/Kentucky/Louisville", + "America/Kentucky/Monticello", + "America/Knox_IN", + "America/Kralendijk", + "America/La_Paz", + "America/Lima", + "America/Los_Angeles", + "America/Louisville", + "America/Lower_Princes", + "America/Maceio", + "America/Managua", + "America/Manaus", + "America/Marigot", + "America/Martinique", + "America/Matamoros", + "America/Mazatlan", + "America/Mendoza", + "America/Menominee", + "America/Merida", + "America/Metlakatla", + "America/Mexico_City", + "America/Miquelon", + "America/Moncton", + "America/Monterrey", + "America/Montevideo", + "America/Montreal", + "America/Montserrat", + "America/Nassau", + "America/New_York", + "America/Nipigon", + "America/Nome", + "America/Noronha", + "America/North_Dakota/Beulah", + "America/North_Dakota/Center", + "America/North_Dakota/New_Salem", + "America/Ojinaga", + "America/Panama", + "America/Pangnirtung", + "America/Paramaribo", + "America/Phoenix", + "America/Port-au-Prince", + "America/Port_of_Spain", + "America/Porto_Acre", + "America/Porto_Velho", + "America/Puerto_Rico", + "America/Punta_Arenas", + "America/Rainy_River", + "America/Rankin_Inlet", + "America/Recife", + "America/Regina", + "America/Resolute", + "America/Rio_Branco", + "America/Rosario", + "America/Santa_Isabel", + "America/Santarem", + "America/Santiago", + "America/Santo_Domingo", + "America/Sao_Paulo", + "America/Scoresbysund", + "America/Shiprock", + "America/Sitka", + "America/St_Barthelemy", + "America/St_Johns", + "America/St_Kitts", + "America/St_Lucia", + "America/St_Thomas", + "America/St_Vincent", + "America/Swift_Current", + "America/Tegucigalpa", + "America/Thule", + "America/Thunder_Bay", + "America/Tijuana", + "America/Toronto", + "America/Tortola", + "America/Vancouver", + "America/Virgin", + "America/Whitehorse", + "America/Winnipeg", + "America/Yakutat", + "America/Yellowknife", + "Antarctica/Casey", + "Antarctica/Davis", + "Antarctica/DumontDUrville", + "Antarctica/Macquarie", + "Antarctica/Mawson", + "Antarctica/McMurdo", + "Antarctica/Palmer", + "Antarctica/Rothera", + "Antarctica/South_Pole", + "Antarctica/Syowa", + "Antarctica/Troll", + "Antarctica/Vostok", + "Arctic/Longyearbyen", + "Asia/Aden", + "Asia/Almaty", + "Asia/Amman", + "Asia/Anadyr", + "Asia/Aqtau", + "Asia/Aqtobe", + "Asia/Ashgabat", + "Asia/Ashkhabad", + "Asia/Atyrau", + "Asia/Baghdad", + "Asia/Bahrain", + "Asia/Baku", + "Asia/Bangkok", + "Asia/Barnaul", + "Asia/Beirut", + "Asia/Bishkek", + "Asia/Brunei", + "Asia/Calcutta", + "Asia/Chita", + "Asia/Choibalsan", + "Asia/Chongqing", + "Asia/Chungking", + "Asia/Colombo", + "Asia/Dacca", + "Asia/Damascus", + "Asia/Dhaka", + "Asia/Dili", + "Asia/Dubai", + "Asia/Dushanbe", + "Asia/Famagusta", + "Asia/Gaza", + "Asia/Harbin", + "Asia/Hebron", + "Asia/Ho_Chi_Minh", + "Asia/Hong_Kong", + "Asia/Hovd", + "Asia/Irkutsk", + "Asia/Istanbul", + "Asia/Jakarta", + "Asia/Jayapura", + "Asia/Jerusalem", + "Asia/Kabul", + "Asia/Kamchatka", + "Asia/Karachi", + "Asia/Kashgar", + "Asia/Kathmandu", + "Asia/Katmandu", + "Asia/Khandyga", + "Asia/Kolkata", + "Asia/Krasnoyarsk", + "Asia/Kuala_Lumpur", + "Asia/Kuching", + "Asia/Kuwait", + "Asia/Macao", + "Asia/Macau", + "Asia/Magadan", + "Asia/Makassar", + "Asia/Manila", + "Asia/Muscat", + "Asia/Nicosia", + "Asia/Novokuznetsk", + "Asia/Novosibirsk", + "Asia/Omsk", + "Asia/Oral", + "Asia/Phnom_Penh", + "Asia/Pontianak", + "Asia/Pyongyang", + "Asia/Qatar", + "Asia/Qyzylorda", + "Asia/Rangoon", + "Asia/Riyadh", + "Asia/Saigon", + "Asia/Sakhalin", + "Asia/Samarkand", + "Asia/Seoul", + "Asia/Shanghai", + "Asia/Singapore", + "Asia/Srednekolymsk", + "Asia/Taipei", + "Asia/Tashkent", + "Asia/Tbilisi", + "Asia/Tehran", + "Asia/Tel_Aviv", + "Asia/Thimbu", + "Asia/Thimphu", + "Asia/Tokyo", + "Asia/Tomsk", + "Asia/Ujung_Pandang", + "Asia/Ulaanbaatar", + "Asia/Ulan_Bator", + "Asia/Urumqi", + "Asia/Ust-Nera", + "Asia/Vientiane", + "Asia/Vladivostok", + "Asia/Yakutsk", + "Asia/Yangon", + "Asia/Yekaterinburg", + "Asia/Yerevan", + "Atlantic/Azores", + "Atlantic/Bermuda", + "Atlantic/Canary", + "Atlantic/Cape_Verde", + "Atlantic/Faeroe", + "Atlantic/Faroe", + "Atlantic/Jan_Mayen", + "Atlantic/Madeira", + "Atlantic/Reykjavik", + "Atlantic/South_Georgia", + "Atlantic/St_Helena", + "Atlantic/Stanley", + "Australia/ACT", + "Australia/Adelaide", + "Australia/Brisbane", + "Australia/Broken_Hill", + "Australia/Canberra", + "Australia/Currie", + "Australia/Darwin", + "Australia/Eucla", + "Australia/Hobart", + "Australia/LHI", + "Australia/Lindeman", + "Australia/Lord_Howe", + "Australia/Melbourne", + "Australia/NSW", + "Australia/North", + "Australia/Perth", + "Australia/Queensland", + "Australia/South", + "Australia/Sydney", + "Australia/Tasmania", + "Australia/Victoria", + "Australia/West", + "Australia/Yancowinna", + "Europe/Amsterdam", + "Europe/Andorra", + "Europe/Astrakhan", + "Europe/Athens", + "Europe/Belfast", + "Europe/Belgrade", + "Europe/Berlin", + "Europe/Bratislava", + "Europe/Brussels", + "Europe/Bucharest", + "Europe/Budapest", + "Europe/Busingen", + "Europe/Chisinau", + "Europe/Copenhagen", + "Europe/Dublin", + "Europe/Gibraltar", + "Europe/Guernsey", + "Europe/Helsinki", + "Europe/Isle_of_Man", + "Europe/Istanbul", + "Europe/Jersey", + "Europe/Kaliningrad", + "Europe/Kiev", + "Europe/Kirov", + "Europe/Lisbon", + "Europe/Ljubljana", + "Europe/London", + "Europe/Luxembourg", + "Europe/Madrid", + "Europe/Malta", + "Europe/Mariehamn", + "Europe/Minsk", + "Europe/Monaco", + "Europe/Moscow", + "Europe/Nicosia", + "Europe/Oslo", + "Europe/Paris", + "Europe/Podgorica", + "Europe/Prague", + "Europe/Riga", + "Europe/Rome", + "Europe/Samara", + "Europe/San_Marino", + "Europe/Sarajevo", + "Europe/Saratov", + "Europe/Simferopol", + "Europe/Skopje", + "Europe/Sofia", + "Europe/Stockholm", + "Europe/Tallinn", + "Europe/Tirane", + "Europe/Tiraspol", + "Europe/Ulyanovsk", + "Europe/Uzhgorod", + "Europe/Vaduz", + "Europe/Vatican", + "Europe/Vienna", + "Europe/Vilnius", + "Europe/Volgograd", + "Europe/Warsaw", + "Europe/Zagreb", + "Europe/Zaporozhye", + "Europe/Zurich", + "Indian/Antananarivo", + "Indian/Chagos", + "Indian/Christmas", + "Indian/Cocos", + "Indian/Comoro", + "Indian/Kerguelen", + "Indian/Mahe", + "Indian/Maldives", + "Indian/Mauritius", + "Indian/Mayotte", + "Indian/Reunion", + "Pacific/Apia", + "Pacific/Auckland", + "Pacific/Bougainville", + "Pacific/Chatham", + "Pacific/Chuuk", + "Pacific/Easter", + "Pacific/Efate", + "Pacific/Enderbury", + "Pacific/Fakaofo", + "Pacific/Fiji", + "Pacific/Funafuti", + "Pacific/Galapagos", + "Pacific/Gambier", + "Pacific/Guadalcanal", + "Pacific/Guam", + "Pacific/Honolulu", + "Pacific/Johnston", + "Pacific/Kiritimati", + "Pacific/Kosrae", + "Pacific/Kwajalein", + "Pacific/Majuro", + "Pacific/Marquesas", + "Pacific/Midway", + "Pacific/Nauru", + "Pacific/Niue", + "Pacific/Norfolk", + "Pacific/Noumea", + "Pacific/Pago_Pago", + "Pacific/Palau", + "Pacific/Pitcairn", + "Pacific/Pohnpei", + "Pacific/Ponape", + "Pacific/Port_Moresby", + "Pacific/Rarotonga", + "Pacific/Saipan", + "Pacific/Samoa", + "Pacific/Tahiti", + "Pacific/Tarawa", + "Pacific/Tongatapu", + "Pacific/Truk", + "Pacific/Wake", + "Pacific/Wallis", + "Pacific/Yap" +} + +local utcnow = luatz.time () + +print("map $geoip2_timezone $geoip2_offset {") + +for loop, timezone in ipairs(timezones) do + print('\t"' .. timezone .. '" ' .. + luatz.get_tz(timezone):find_current(utcnow).gmtoff .. ';') +end + +print("}") diff --git a/watchtower/Dockerfile b/watchtower/Dockerfile index 1ea6ca2..30b5e42 100644 --- a/watchtower/Dockerfile +++ b/watchtower/Dockerfile @@ -10,7 +10,7 @@ RUN apk --no-cache add \ ENV PATH /go/bin:/usr/local/go/bin:$PATH ENV GOPATH /go -ENV WATCHTOWER_VERSION v1.0.1 +ENV WATCHTOWER_VERSION v1.0.2 RUN git clone --depth 1 --branch ${WATCHTOWER_VERSION} https://github.com/containrrr/watchtower /go/src/github.com/containrrr/watchtower diff --git a/znc/Dockerfile b/znc/Dockerfile index 22f4592..36ed7e2 100644 --- a/znc/Dockerfile +++ b/znc/Dockerfile @@ -22,7 +22,7 @@ RUN adduser -u 1001 -D user \ ENV LANG C.UTF-8 -ENV ZNC_VERSION 1.8.0 +ENV ZNC_VERSION 1.8.1-rc1 RUN set -x \ && apk add --no-cache --virtual .build-deps \