Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
Signed-off-by: Jess Frazelle <[email protected]>
  • Loading branch information
jessfraz committed Jun 5, 2020
1 parent 81c7899 commit b5e75f6
Show file tree
Hide file tree
Showing 11 changed files with 1,268 additions and 12 deletions.
2 changes: 1 addition & 1 deletion certbot/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion clair/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion gcloud/Dockerfile
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down
1 change: 1 addition & 0 deletions latest-versions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pomerium/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
16 changes: 10 additions & 6 deletions telize/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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/

Expand Down Expand Up @@ -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 \
Expand Down
251 changes: 251 additions & 0 deletions telize/country-code3.conf
Original file line number Diff line number Diff line change
@@ -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";
}
Loading

0 comments on commit b5e75f6

Please sign in to comment.