Skip to content

Commit

Permalink
fix arch arm64
Browse files Browse the repository at this point in the history
  • Loading branch information
up9cloud committed Jul 3, 2024
1 parent 1c3c31a commit 64520df
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 18 deletions.
20 changes: 14 additions & 6 deletions Dockerfile-0
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
FROM alpine:3.20 AS builder
FROM golang:1.20 AS builder

ARG BUILDARCH

ENV GOCRON2_VERSION=1.6.2
ENV GOCRON2_REPO_BASEURL=https://github.com/up9cloud/gocron2
ENV GOCRON2_DOWNLOAD_FILE=gocron2-v${GOCRON2_VERSION}-linux-amd64.tar.gz
ENV GOCRON2_DOWNLOAD_FILE=gocron2-v${GOCRON2_VERSION}-linux-${BUILDARCH}.tar.gz
ENV GOCRON2_DOWNLOAD_URL=${GOCRON2_REPO_BASEURL}/releases/download/v${GOCRON2_VERSION}/${GOCRON2_DOWNLOAD_FILE}
ENV GOCRON2_NODE_DOWNLOAD_FILE=gocron2-node-v${GOCRON2_VERSION}-linux-amd64.tar.gz
ENV GOCRON2_NODE_DOWNLOAD_FILE=gocron2-node-v${GOCRON2_VERSION}-linux-${BUILDARCH}.tar.gz
ENV GOCRON2_NODE_DOWNLOAD_URL=${GOCRON2_REPO_BASEURL}/releases/download/v${GOCRON2_VERSION}/${GOCRON2_NODE_DOWNLOAD_FILE}
ENV CERTSTRAP_VERSION=1.3.0
ENV CERTSTRAP_DOWNLOAD_URL=https://github.com/square/certstrap/releases/download/v${CERTSTRAP_VERSION}/certstrap-linux-amd64
Expand All @@ -15,6 +17,12 @@ RUN set -ex; \
tar zvxf ${GOCRON2_DOWNLOAD_FILE}; \
wget ${GOCRON2_NODE_DOWNLOAD_URL}; \
tar zvxf ${GOCRON2_NODE_DOWNLOAD_FILE}; \
wget ${CERTSTRAP_DOWNLOAD_URL} -O certstrap; \
chmod +x certstrap; \
chown -R root:root .
git clone https://github.com/square/certstrap.git c; \
cd c; \
git checkout 86891c19509ef6891853e2eb366ca310332db6b8; \
CGO_ENABLED=0 go build -buildvcs=false -o certstrap github.com/square/certstrap; \
mv certstrap /tmp/certstrap; \
cd /tmp; \
# wget ${CERTSTRAP_DOWNLOAD_URL} -O certstrap; \
chmod +x certstrap; \
chown -R root:root .
1 change: 1 addition & 0 deletions Dockerfile-all.template
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ COPY run-all.sh /gocron2/run-all.sh
COPY init-cert.sh /gocron2/init-cert.sh

# https://github.com/node-red/node-red-docker/blob/master/docker-custom/Dockerfile.debian
# https://npmtrends.com/n8n-vs-node-red
RUN set -ex; \
apt update; \
DEBIAN_FRONTEND=noninteractive apt install --no-install-recommends -y \
Expand Down
21 changes: 15 additions & 6 deletions all/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
FROM alpine:3.20 AS builder
FROM golang:1.20 AS builder

ARG BUILDARCH

ENV GOCRON2_VERSION=1.6.2
ENV GOCRON2_REPO_BASEURL=https://github.com/up9cloud/gocron2
ENV GOCRON2_DOWNLOAD_FILE=gocron2-v${GOCRON2_VERSION}-linux-amd64.tar.gz
ENV GOCRON2_DOWNLOAD_FILE=gocron2-v${GOCRON2_VERSION}-linux-${BUILDARCH}.tar.gz
ENV GOCRON2_DOWNLOAD_URL=${GOCRON2_REPO_BASEURL}/releases/download/v${GOCRON2_VERSION}/${GOCRON2_DOWNLOAD_FILE}
ENV GOCRON2_NODE_DOWNLOAD_FILE=gocron2-node-v${GOCRON2_VERSION}-linux-amd64.tar.gz
ENV GOCRON2_NODE_DOWNLOAD_FILE=gocron2-node-v${GOCRON2_VERSION}-linux-${BUILDARCH}.tar.gz
ENV GOCRON2_NODE_DOWNLOAD_URL=${GOCRON2_REPO_BASEURL}/releases/download/v${GOCRON2_VERSION}/${GOCRON2_NODE_DOWNLOAD_FILE}
ENV CERTSTRAP_VERSION=1.3.0
ENV CERTSTRAP_DOWNLOAD_URL=https://github.com/square/certstrap/releases/download/v${CERTSTRAP_VERSION}/certstrap-linux-amd64
Expand All @@ -15,9 +17,15 @@ RUN set -ex; \
tar zvxf ${GOCRON2_DOWNLOAD_FILE}; \
wget ${GOCRON2_NODE_DOWNLOAD_URL}; \
tar zvxf ${GOCRON2_NODE_DOWNLOAD_FILE}; \
wget ${CERTSTRAP_DOWNLOAD_URL} -O certstrap; \
chmod +x certstrap; \
chown -R root:root .
git clone https://github.com/square/certstrap.git c; \
cd c; \
git checkout 86891c19509ef6891853e2eb366ca310332db6b8; \
CGO_ENABLED=0 go build -buildvcs=false -o certstrap github.com/square/certstrap; \
mv certstrap /tmp/certstrap; \
cd /tmp; \
# wget ${CERTSTRAP_DOWNLOAD_URL} -O certstrap; \
chmod +x certstrap; \
chown -R root:root .

FROM sstc/headful-chromium:ubuntu-24
RUN set -ex; \
Expand Down Expand Up @@ -63,6 +71,7 @@ COPY run-all.sh /gocron2/run-all.sh
COPY init-cert.sh /gocron2/init-cert.sh

# https://github.com/node-red/node-red-docker/blob/master/docker-custom/Dockerfile.debian
# https://npmtrends.com/n8n-vs-node-red
RUN set -ex; \
apt update; \
DEBIAN_FRONTEND=noninteractive apt install --no-install-recommends -y \
Expand Down
20 changes: 14 additions & 6 deletions server/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
FROM alpine:3.20 AS builder
FROM golang:1.20 AS builder

ARG BUILDARCH

ENV GOCRON2_VERSION=1.6.2
ENV GOCRON2_REPO_BASEURL=https://github.com/up9cloud/gocron2
ENV GOCRON2_DOWNLOAD_FILE=gocron2-v${GOCRON2_VERSION}-linux-amd64.tar.gz
ENV GOCRON2_DOWNLOAD_FILE=gocron2-v${GOCRON2_VERSION}-linux-${BUILDARCH}.tar.gz
ENV GOCRON2_DOWNLOAD_URL=${GOCRON2_REPO_BASEURL}/releases/download/v${GOCRON2_VERSION}/${GOCRON2_DOWNLOAD_FILE}
ENV GOCRON2_NODE_DOWNLOAD_FILE=gocron2-node-v${GOCRON2_VERSION}-linux-amd64.tar.gz
ENV GOCRON2_NODE_DOWNLOAD_FILE=gocron2-node-v${GOCRON2_VERSION}-linux-${BUILDARCH}.tar.gz
ENV GOCRON2_NODE_DOWNLOAD_URL=${GOCRON2_REPO_BASEURL}/releases/download/v${GOCRON2_VERSION}/${GOCRON2_NODE_DOWNLOAD_FILE}
ENV CERTSTRAP_VERSION=1.3.0
ENV CERTSTRAP_DOWNLOAD_URL=https://github.com/square/certstrap/releases/download/v${CERTSTRAP_VERSION}/certstrap-linux-amd64
Expand All @@ -15,9 +17,15 @@ RUN set -ex; \
tar zvxf ${GOCRON2_DOWNLOAD_FILE}; \
wget ${GOCRON2_NODE_DOWNLOAD_URL}; \
tar zvxf ${GOCRON2_NODE_DOWNLOAD_FILE}; \
wget ${CERTSTRAP_DOWNLOAD_URL} -O certstrap; \
chmod +x certstrap; \
chown -R root:root .
git clone https://github.com/square/certstrap.git c; \
cd c; \
git checkout 86891c19509ef6891853e2eb366ca310332db6b8; \
CGO_ENABLED=0 go build -buildvcs=false -o certstrap github.com/square/certstrap; \
mv certstrap /tmp/certstrap; \
cd /tmp; \
# wget ${CERTSTRAP_DOWNLOAD_URL} -O certstrap; \
chmod +x certstrap; \
chown -R root:root .

FROM scratch

Expand Down

0 comments on commit 64520df

Please sign in to comment.