diff --git a/outline-ss-server/Dockerfile b/outline-ss-server/Dockerfile index 2f428c4..ce9931f 100644 --- a/outline-ss-server/Dockerfile +++ b/outline-ss-server/Dockerfile @@ -5,11 +5,15 @@ FROM alpine:3 MAINTAINER EasyPi Software Foundation -ARG OUTLINE_SS_SERVER_VERSION=1.4.0 +ARG OUTLINE_SS_SERVER_VERSION=1.5.0 ARG OUTLINE_SS_SERVER_FILE=outline-ss-server_${OUTLINE_SS_SERVER_VERSION}_linux_x86_64.tar.gz ARG OUTLINE_SS_SERVER_URL=https://github.com/Jigsaw-Code/outline-ss-server/releases/download/v${OUTLINE_SS_SERVER_VERSION}/${OUTLINE_SS_SERVER_FILE} -ARG IP_COUNTRY_MMDB_VERSION=2023-06 +ARG IP_ASN_MMDB_VERSION=2024-07 +ARG IP_ASN_MMDB_URL=https://download.db-ip.com/free/dbip-asn-lite-${IP_ASN_MMDB_VERSION}.mmdb.gz +ARG IP_ASN_MMDB_FILE=ip-asn.mmdb + +ARG IP_COUNTRY_MMDB_VERSION=2024-07 ARG IP_COUNTRY_MMDB_URL=https://download.db-ip.com/free/dbip-country-lite-${IP_COUNTRY_MMDB_VERSION}.mmdb.gz ARG IP_COUNTRY_MMDB_FILE=ip-country.mmdb @@ -19,6 +23,7 @@ RUN set -xe \ && apk add --no-cache curl tar \ && mkdir -p bin etc var \ && curl -sSL ${OUTLINE_SS_SERVER_URL} | tar xz -C bin outline-ss-server \ + && curl -sSL ${IP_ASN_MMDB_URL} | gunzip -c > var/${IP_ASN_MMDB_FILE} \ && curl -sSL ${IP_COUNTRY_MMDB_URL} | gunzip -c > var/${IP_COUNTRY_MMDB_FILE} \ && /app/bin/outline-ss-server -version \ && apk del curl tar @@ -26,4 +31,4 @@ RUN set -xe \ EXPOSE 9092 ENTRYPOINT ["/app/bin/outline-ss-server"] -CMD ["-config=etc/config.yml", "-ip_country_db=var/ip-country.mmdb", "-metrics=0.0.0.0:9092", "-replay_history=10000"] +CMD ["-config=etc/config.yml", "-ip_asn_db=var/ip-asn.mmdb", "-ip_country_db=var/ip-country.mmdb", "-metrics=0.0.0.0:9092", "-replay_history=10000"] diff --git a/outline-ss-server/systemd/outline-ss-server.service b/outline-ss-server/systemd/outline-ss-server.service index 2694c18..1023552 100644 --- a/outline-ss-server/systemd/outline-ss-server.service +++ b/outline-ss-server/systemd/outline-ss-server.service @@ -6,7 +6,13 @@ After=network.target User=vpn Group=vpn WorkingDirectory=/etc/outline-ss-server -ExecStart=/usr/local/bin/outline-ss-server -config=config.yml -metrics=127.0.0.1:9092 -ip_country_db=ip-country.mmdb -replay_history=10000 +# https://download.db-ip.com/free/dbip-asn-lite-2024-07.mmdb.gz +# https://download.db-ip.com/free/dbip-country-lite-2024-07.mmdb.gz +ExecStart=/usr/local/bin/outline-ss-server -config=config.yml \ + -ip_asn_db=ip-asn.mmdb \ + -ip_country_db=ip-country.mmdb \ + -metrics=127.0.0.1:9092 \ + -replay_history=10000 ExecReload=/bin/kill -HUP $MAINPID LimitNOFILE=65536 RestartSec=5