Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[OPS-8056] xz sure why not #292

Open
wants to merge 16 commits into
base: main
Choose a base branch
from
Open

[OPS-8056] xz sure why not #292

Changes from 2 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
9fbebcc
[OPS-8056] GitHub uses xz now apparently, install it and invoke tar t…
cafuego Jan 28, 2022
9fec25d
[OPS-8056] Head chasing. Packages are now tar.xz format, amd64 arch i…
cafuego Jan 28, 2022
eefb488
Update alpine-base-s6/Dockerfile.tmpl
cafuego Jan 28, 2022
8ba0d10
[OPS-8055] Treat pingdom as a human, so there are no fake outage aler…
cafuego Jan 30, 2022
35e983c
[OPS-8056] GitHub uses xz now apparently, install it and invoke tar t…
cafuego Jan 28, 2022
f7f036d
[OPS-8056] Head chasing. Packages are now tar.xz format, amd64 arch i…
cafuego Jan 28, 2022
1ed1fb5
Update alpine-base-s6/Dockerfile.tmpl
cafuego Jan 28, 2022
e66f8ee
[OPS-8056] Update the path of the s6 run script interpreters.
cafuego Jan 30, 2022
4d6d152
[OPS-8056] Ensure the FPM run scripts are executable.
cafuego Jan 30, 2022
2ef669e
[OPS-8056] Ensure the New Relic run scripts are executable.
cafuego Jan 30, 2022
f19c0f8
[OPS-8056] Ensure the nginx run scripts are executable and use the co…
cafuego Jan 30, 2022
927755d
[OPS-8056] Our custom PATH is not inherited, use the full path to nginx.
cafuego Jan 30, 2022
5c0e34e
[OPS-8056] Test cleanup.
cafuego Jan 30, 2022
c5f1ccd
[OPS-8056] Override the shipped entrypoint so we can specify PATH via…
cafuego Jan 31, 2022
c3892b7
Merge branch 'cafuego/ops-8056-xz-sure-why-not' of github.com:UN-OCHA…
cafuego Jan 31, 2022
fd78513
[OPS-8096] Commit (trivial) varnish WIP.
cafuego Feb 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions alpine-base-s6/Dockerfile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ LABEL org.label-schema.schema-version="1.0" \
org.label-schema.distribution="Alpine Linux" \
org.label-schema.distribution-version=$UPSTREAM

RUN apk add --no-cache --purge -uU curl && \
RUN apk add --no-cache --purge -uU xz curl && \
S6VERSION=$(curl -sSL https://api.github.com/repos/just-containers/s6-overlay/releases/latest | awk '/tag_name/{print $4;exit}' FS='[""]' | sed -e 's_v__') && \
S6ARCH=$(uname -m | sed 's/x86_64/amd64/') && \
S6ARCH=$(uname -m) && \
echo "Installing s6 version: $S6VERSION for $S6ARCH" && \
curl -o /tmp/s6-overlay.tar.gz -jkSL https://github.com/just-containers/s6-overlay/releases/download/v${S6VERSION}/s6-overlay-${S6ARCH}.tar.gz && \
tar xzf /tmp/s6-overlay.tar.gz -C / && \
curl -o /tmp/s6-overlay.tar.xz -jkSL https://github.com/just-containers/s6-overlay/releases/download/v${S6VERSION}/s6-overlay-${S6ARCH}-${S6VERSION}.tar.xz && \
orakili marked this conversation as resolved.
Show resolved Hide resolved
tar xJf /tmp/s6-overlay.tar.xz -C / && \
rm -rf /var/cache/apk/* /tmp/*

ENTRYPOINT ["/init"]
Expand Down