Skip to content

Commit

Permalink
migrate to s6 v3, readiness looks like doesn't work and S6_GLOBAL_PAT…
Browse files Browse the repository at this point in the history
…H also doesn't work just-containers/s6-overlay#407
  • Loading branch information
Julio Gutierrez committed Feb 14, 2022
1 parent 412d8dc commit 716f6a2
Show file tree
Hide file tree
Showing 10 changed files with 12 additions and 15 deletions.
6 changes: 5 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,8 @@ RUN apt-get update -y && \

COPY /rootfs /
ENV S6_CMD_WAIT_FOR_SERVICES=1
CMD nord_login && nord_config && nord_connect && nord_migrate && nord_watch
CMD sleep 1 && nord_login && nord_config && nord_connect && nord_migrate && nord_watch
RUN chmod 0755 -R /etc/cont-init.d && \
chmod 0755 -R /etc/services.d && \
chmod 0755 -R /usr/bin && \
echo "/command:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" > /etc/s6-overlay/config/global_path
2 changes: 1 addition & 1 deletion rootfs/etc/cont-init.d/30-route
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bash
#!/command/with-contenv bash

[[ -n ${NETWORK} && -z ${NET_LOCAL} ]] && NET_LOCAL=${NETWORK}
if [ -n "$NET_LOCAL" ]; then
Expand Down
2 changes: 1 addition & 1 deletion rootfs/etc/cont-init.d/30-route6
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bash
#!/command/with-contenv bash

[[ -n ${NETWORK6} && -z ${NET6_LOCAL} ]] && NET6_LOCAL=${NETWORK6}
if [ -n "$NET6_LOCAL" ]; then
Expand Down
2 changes: 1 addition & 1 deletion rootfs/etc/cont-init.d/40-allowlist
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bash
#!/command/with-contenv bash

[[ -n ${WHITELIST} && -z ${ALLOW_LIST} ]] && ALLOW_LIST=${WHITELIST}
if [[ -n ${ALLOW_LIST} ]]; then
Expand Down
2 changes: 0 additions & 2 deletions rootfs/etc/fix-attrs.d/docker_utils

This file was deleted.

5 changes: 0 additions & 5 deletions rootfs/etc/fix-attrs.d/nord_utils

This file was deleted.

2 changes: 1 addition & 1 deletion rootfs/usr/bin/nord_config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bash
#!/command/with-contenv bash

[[ -n ${DNS} ]] && nordvpn set dns ${DNS//[;,]/ }

Expand Down
2 changes: 1 addition & 1 deletion rootfs/usr/bin/nord_connect
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bash
#!/command/with-contenv bash

[[ -n ${PRE_CONNECT} ]] && eval ${PRE_CONNECT}

Expand Down
2 changes: 1 addition & 1 deletion rootfs/usr/bin/nord_login
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bash
#!/command/with-contenv bash

if ! iptables -L > /dev/null 2>&1; then
echo "FATAL: iptables is not functional. Ensure your container config adds --cap-add=NET_ADMIN,NET_RAW" 1>&2
Expand Down
2 changes: 1 addition & 1 deletion rootfs/usr/bin/nord_migrate
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/with-contenv bash
#!/command/with-contenv bash

shopt -s nocasematch; if [[ "${TECHNOLOGY:-NordLynx}" =~ "NordLynx" ]]; then
echo "############################################################"
Expand Down

0 comments on commit 716f6a2

Please sign in to comment.