Skip to content

Update parse-template #59

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

Merged
fbjorn merged 3 commits into from
Apr 11, 2025
Merged

Update parse-template #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e1b3218
Update parse-template
fbjorn Apr 4, 2025
2cbb670
Enhance parse-template installation for multi-architecture support
fbjorn Apr 11, 2025
167bc42
Improve conditions
fbjorn Apr 11, 2025
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
17 changes: 13 additions & 4 deletions nginx-base/alpine-nginx/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,23 @@
FROM nginx:stable-alpine

ENV PARSE_TEMPLATE_VERSION=v1.0.0 \
PARSE_TEMPLATE_HASH=8d1dc39e701b938f4874f3f8130cd3a324e7fa4697af36541918f9398dd61223
ENV PARSE_TEMPLATE_VERSION=v1.0.1 \
PARSE_TEMPLATE_HASH_X86_64="dcfbc9e843292664aab43cd942694019ae566dc6ab83567f4339e942da76360b" \
PARSE_TEMPLATE_HASH_ARM64="d305ac32e970bf12572e67e5aa09e202b2b49279a4aaa81000bb7ae94b179648"

RUN set -exu \
&& apk update \
&& apk upgrade --available \
&& apk add --virtual build-deps curl \
&& curl -L -o /usr/bin/parse-template https://github.com/cocreators-ee/parse-template/releases/download/${PARSE_TEMPLATE_VERSION}/parse-template-linux-amd64 \
&& echo "${PARSE_TEMPLATE_HASH} /usr/bin/parse-template" | sha256sum -c \
&& if [ "$(uname -m)" = "x86_64" ]; then \
curl -L -o /usr/bin/parse-template "https://github.com/cocreators-ee/parse-template/releases/download/${PARSE_TEMPLATE_VERSION}/parse-template_Linux_x86_64" && \
echo "${PARSE_TEMPLATE_HASH_X86_64} /usr/bin/parse-template" | sha256sum -c; \
elif [ "$(uname -m)" = "arm64" ] || [ "$(uname -m)" = "aarch64" ]; then \
curl -L -o /usr/bin/parse-template "https://github.com/cocreators-ee/parse-template/releases/download/${PARSE_TEMPLATE_VERSION}/parse-template_Linux_arm64" && \
echo "${PARSE_TEMPLATE_HASH_ARM64} /usr/bin/parse-template" | sha256sum -c; \
else \
echo "Unsupported architecture: $(uname -m)" && \
exit 1; \
fi \
&& chmod +x /usr/bin/parse-template \
&& mkdir -p /run/nginx/ \
&& apk del build-deps \
Expand Down
5 changes: 3 additions & 2 deletions python-base/ubuntu22.04-python3.11-nginx/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ ARG LOCAL_REGISTRY=""
FROM ${LOCAL_REGISTRY}python-base:ubuntu22.04-python3.11

ENV \
PARSE_TEMPLATE_HASH="8d1dc39e701b938f4874f3f8130cd3a324e7fa4697af36541918f9398dd61223" \
PARSE_TEMPLATE_VERSION="v1.0.0" \
PARSE_TEMPLATE_HASH_X86_64="dcfbc9e843292664aab43cd942694019ae566dc6ab83567f4339e942da76360b" \
PARSE_TEMPLATE_HASH_ARM64="d305ac32e970bf12572e67e5aa09e202b2b49279a4aaa81000bb7ae94b179648" \
PARSE_TEMPLATE_VERSION="v1.0.1" \
ENV_LAST_LINE="LEAVE-ME-HERE"

# Run docker/base-prepare.sh
Expand Down
16 changes: 13 additions & 3 deletions python-base/ubuntu22.04-python3.11-nginx/docker/base-prepare.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,19 @@ apt-get install -y --no-install-recommends \
# This line is intentionally empty to preserve trailing \ in previous list

# Install parse-template
curl -L -o /usr/bin/parse-template \
"https://github.com/cocreators-ee/parse-template/releases/download/${PARSE_TEMPLATE_VERSION}/parse-template-linux-amd64"
echo "${PARSE_TEMPLATE_HASH} /usr/bin/parse-template" | sha256sum -c
ARCH=$(uname -m)
if [ "${ARCH}" = "x86_64" ]; then
curl -L -o /usr/bin/parse-template \
"https://github.com/cocreators-ee/parse-template/releases/download/${PARSE_TEMPLATE_VERSION}/parse-template_Linux_x86_64"
echo "${PARSE_TEMPLATE_HASH_X86_64} /usr/bin/parse-template" | sha256sum -c
elif [ "${ARCH}" = "arm64" ] || [ "${ARCH}" = "aarch64" ]; then
curl -L -o /usr/bin/parse-template \
"https://github.com/cocreators-ee/parse-template/releases/download/${PARSE_TEMPLATE_VERSION}/parse-template_Linux_arm64"
echo "${PARSE_TEMPLATE_HASH_ARM64} /usr/bin/parse-template" | sha256sum -c
else
echo "Unsupported architecture: ${ARCH}"
exit 1
fi
chmod +x /usr/bin/parse-template

# ---------------
Expand Down
5 changes: 3 additions & 2 deletions python-base/ubuntu24.04-python3.13-nginx/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ ARG LOCAL_REGISTRY=""
FROM ${LOCAL_REGISTRY}python-base:ubuntu24.04-python3.13

ENV \
PARSE_TEMPLATE_HASH="8d1dc39e701b938f4874f3f8130cd3a324e7fa4697af36541918f9398dd61223" \
PARSE_TEMPLATE_VERSION="v1.0.0" \
PARSE_TEMPLATE_HASH_X86_64="dcfbc9e843292664aab43cd942694019ae566dc6ab83567f4339e942da76360b" \
PARSE_TEMPLATE_HASH_ARM64="d305ac32e970bf12572e67e5aa09e202b2b49279a4aaa81000bb7ae94b179648" \
PARSE_TEMPLATE_VERSION="v1.0.1" \
ENV_LAST_LINE="LEAVE-ME-HERE"

# Run docker/base-prepare.sh
Expand Down
16 changes: 13 additions & 3 deletions python-base/ubuntu24.04-python3.13-nginx/docker/base-prepare.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,19 @@ apt-get install -y --no-install-recommends \
# This line is intentionally empty to preserve trailing \ in previous list

# Install parse-template
curl -L -o /usr/bin/parse-template \
"https://github.com/cocreators-ee/parse-template/releases/download/${PARSE_TEMPLATE_VERSION}/parse-template-linux-amd64"
echo "${PARSE_TEMPLATE_HASH} /usr/bin/parse-template" | sha256sum -c
ARCH=$(uname -m)
if [ "${ARCH}" = "x86_64" ]; then
curl -L -o /usr/bin/parse-template \
"https://github.com/cocreators-ee/parse-template/releases/download/${PARSE_TEMPLATE_VERSION}/parse-template_Linux_x86_64"
echo "${PARSE_TEMPLATE_HASH_X86_64} /usr/bin/parse-template" | sha256sum -c
elif [ "${ARCH}" = "arm64" ] || [ "${ARCH}" = "aarch64" ]; then
curl -L -o /usr/bin/parse-template \
"https://github.com/cocreators-ee/parse-template/releases/download/${PARSE_TEMPLATE_VERSION}/parse-template_Linux_arm64"
echo "${PARSE_TEMPLATE_HASH_ARM64} /usr/bin/parse-template" | sha256sum -c
else
echo "Unsupported architecture: ${ARCH}"
exit 1
fi
chmod +x /usr/bin/parse-template

# ---------------
Expand Down
Loading