Skip to content

Commit 36ed4a9

Browse files
committed
fix run-all.sh
1 parent 8cf8a61 commit 36ed4a9

File tree

6 files changed

+23
-20
lines changed

6 files changed

+23
-20
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
push: true
3131
platforms: linux/amd64,linux/arm64
3232
file: ./server/Dockerfile
33-
tags: sstc/gocron:server
33+
tags: sstc/gocron2:server
3434
- uses: actions/checkout@v4
3535
- uses: christian-korneck/update-container-description-action@v1
3636
env:

Dockerfile-0

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.7 AS builder
1+
FROM alpine:3.20 AS builder
22

33
ENV GOCRON2_VERSION=1.6.2
44
ENV GOCRON2_REPO_BASEURL=https://github.com/up9cloud/gocron2
@@ -15,5 +15,6 @@ RUN set -ex; \
1515
tar zvxf ${GOCRON2_DOWNLOAD_FILE}; \
1616
wget ${GOCRON2_NODE_DOWNLOAD_URL}; \
1717
tar zvxf ${GOCRON2_NODE_DOWNLOAD_FILE}; \
18-
wget ${CERTSTRAP_DOWNLOAD_URL} -o certstrap; \
19-
chmod +x certstrap
18+
wget ${CERTSTRAP_DOWNLOAD_URL} -O certstrap; \
19+
chmod +x certstrap; \
20+
chown -R root:root .

Dockerfile-all.template

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ RUN set -ex; \
1212
jq \
1313
; \
1414
# In the mean time, install all popular scripting languages
15-
curl -fsSL https://deb.nodesource.com/setup_lts.x | bash -; \
15+
# curl -fsSL https://deb.nodesource.com/setup_lts.x | bash -; \
1616
DEBIAN_FRONTEND=noninteractive apt install --no-install-recommends -y \
17-
nodejs \
18-
npm \
17+
# nodejs \
18+
# npm \
1919
php \
2020
ruby \
2121
lua5.4 \
2222
; \
2323
bash --version; \
2424
perl --version; \
25-
python2 --version; \
25+
# python2 --version; \
2626
python3 --version; \
2727
node -v; \
2828
npm -v; \

all/Dockerfile

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.7 AS builder
1+
FROM alpine:3.20 AS builder
22

33
ENV GOCRON2_VERSION=1.6.2
44
ENV GOCRON2_REPO_BASEURL=https://github.com/up9cloud/gocron2
@@ -15,8 +15,9 @@ RUN set -ex; \
1515
tar zvxf ${GOCRON2_DOWNLOAD_FILE}; \
1616
wget ${GOCRON2_NODE_DOWNLOAD_URL}; \
1717
tar zvxf ${GOCRON2_NODE_DOWNLOAD_FILE}; \
18-
wget ${CERTSTRAP_DOWNLOAD_URL} -o certstrap; \
19-
chmod +x certstrap
18+
wget ${CERTSTRAP_DOWNLOAD_URL} -O certstrap; \
19+
chmod +x certstrap; \
20+
chown -R root:root .
2021

2122
FROM sstc/headful-chromium:ubuntu-24
2223
RUN set -ex; \
@@ -30,17 +31,17 @@ RUN set -ex; \
3031
jq \
3132
; \
3233
# In the mean time, install all popular scripting languages
33-
curl -fsSL https://deb.nodesource.com/setup_lts.x | bash -; \
34+
# curl -fsSL https://deb.nodesource.com/setup_lts.x | bash -; \
3435
DEBIAN_FRONTEND=noninteractive apt install --no-install-recommends -y \
35-
nodejs \
36-
npm \
36+
# nodejs \
37+
# npm \
3738
php \
3839
ruby \
3940
lua5.4 \
4041
; \
4142
bash --version; \
4243
perl --version; \
43-
python2 --version; \
44+
# python2 --version; \
4445
python3 --version; \
4546
node -v; \
4647
npm -v; \

run-all.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
./gocron web &
4-
./gocron-node -allow-root &
3+
./gocron2 web &
4+
./gocron2-node -allow-root &
55
wait -n
66
exit $?

server/Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM alpine:3.7 AS builder
1+
FROM alpine:3.20 AS builder
22

33
ENV GOCRON2_VERSION=1.6.2
44
ENV GOCRON2_REPO_BASEURL=https://github.com/up9cloud/gocron2
@@ -15,8 +15,9 @@ RUN set -ex; \
1515
tar zvxf ${GOCRON2_DOWNLOAD_FILE}; \
1616
wget ${GOCRON2_NODE_DOWNLOAD_URL}; \
1717
tar zvxf ${GOCRON2_NODE_DOWNLOAD_FILE}; \
18-
wget ${CERTSTRAP_DOWNLOAD_URL} -o certstrap; \
19-
chmod +x certstrap
18+
wget ${CERTSTRAP_DOWNLOAD_URL} -O certstrap; \
19+
chmod +x certstrap; \
20+
chown -R root:root .
2021

2122
FROM scratch
2223

0 commit comments

Comments
 (0)