Skip to content

Commit

Permalink
feat: populate lists at buildtime
Browse files Browse the repository at this point in the history
  • Loading branch information
flameshikari committed Aug 18, 2024
1 parent e48c20b commit 5d60e3c
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 8 deletions.
8 changes: 6 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ RUN <<-"EOT" bash -ex
mkdir easyrsa && curl -s -L $EASYRSA_URL | tar -zxv --strip-components=1 -C $_
EOT

COPY rootfs /

RUN <<-"EOT" bash -ex
OPENVPN_VER=2.6.12
LIBS="libnl-genl-3-dev libssl-dev libcap-ng-dev liblz4-dev libsystemd-dev"
Expand Down Expand Up @@ -86,6 +84,8 @@ RUN <<-"EOT" bash -ex

EOT

COPY rootfs /

RUN <<-"EOF" bash -ex
systemctl enable \
antizapret-update.service \
Expand All @@ -103,6 +103,10 @@ RUN <<-"EOF" bash -ex
done
for list in antizapret/config/*-custom.txt; do rm -f $list; done

ln -sf /root/antizapret/doall.sh /usr/bin/doall

/root/antizapret/doall.sh

rm -frv /tmp/*
EOF

Expand Down
2 changes: 0 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ services:
volumes:
- /etc/localtime:/etc/localtime:ro
- ./keys:/etc/openvpn
- ./temp:/root/antizapret/temp
- ./result:/root/antizapret/result
- ./config:/root/antizapret/config/custom
logging:
driver: json-file
Expand Down
4 changes: 0 additions & 4 deletions rootfs/init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@ DNS_RU=$(resolve $DNS_RU 77.88.8.8)
EOF


# add a symlink for quick access
ln -sf /root/antizapret/doall.sh /usr/bin/doall


# autoload vars when logging in into shell with 'bash -l'
ln -sf /etc/default/antizapret /etc/profile.d/antizapret.sh

Expand Down
File renamed without changes.
Empty file.
Empty file.
Empty file.

0 comments on commit 5d60e3c

Please sign in to comment.