From 36ed4a93b115569e46640a3d457abc32e1128b06 Mon Sep 17 00:00:00 2001
From: up9cloud <8325632+up9cloud@users.noreply.github.com>
Date: Mon, 1 Jul 2024 21:42:32 +0000
Subject: [PATCH] fix run-all.sh

---
 .github/workflows/main.yml |  2 +-
 Dockerfile-0               |  7 ++++---
 Dockerfile-all.template    |  8 ++++----
 all/Dockerfile             | 15 ++++++++-------
 run-all.sh                 |  4 ++--
 server/Dockerfile          |  7 ++++---
 6 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2471c0c..0e0345d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -30,7 +30,7 @@ jobs:
         push: true
         platforms: linux/amd64,linux/arm64
         file: ./server/Dockerfile
-        tags: sstc/gocron:server
+        tags: sstc/gocron2:server
     - uses: actions/checkout@v4
     - uses: christian-korneck/update-container-description-action@v1
       env:
diff --git a/Dockerfile-0 b/Dockerfile-0
index 0024f86..ba76131 100644
--- a/Dockerfile-0
+++ b/Dockerfile-0
@@ -1,4 +1,4 @@
-FROM alpine:3.7 AS builder
+FROM alpine:3.20 AS builder
 
 ENV GOCRON2_VERSION=1.6.2
 ENV GOCRON2_REPO_BASEURL=https://github.com/up9cloud/gocron2
@@ -15,5 +15,6 @@ 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
+	wget ${CERTSTRAP_DOWNLOAD_URL} -O certstrap; \
+	chmod +x certstrap; \
+	chown -R root:root .
diff --git a/Dockerfile-all.template b/Dockerfile-all.template
index f85974e..993ad99 100644
--- a/Dockerfile-all.template
+++ b/Dockerfile-all.template
@@ -12,17 +12,17 @@ RUN set -ex; \
 		jq \
 		; \
 	# In the mean time, install all popular scripting languages
-	curl -fsSL https://deb.nodesource.com/setup_lts.x | bash -; \
+	# curl -fsSL https://deb.nodesource.com/setup_lts.x | bash -; \
 	DEBIAN_FRONTEND=noninteractive apt install --no-install-recommends -y \
-		nodejs \
-		npm \
+	#	nodejs \
+	#	npm \
 		php \
 		ruby \
 		lua5.4 \
 		; \
 	bash --version; \
 	perl --version; \
-	python2 --version; \
+	# python2 --version; \
 	python3 --version; \
 	node -v; \
 	npm -v; \
diff --git a/all/Dockerfile b/all/Dockerfile
index f88d68b..19e7d67 100644
--- a/all/Dockerfile
+++ b/all/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.7 AS builder
+FROM alpine:3.20 AS builder
 
 ENV GOCRON2_VERSION=1.6.2
 ENV GOCRON2_REPO_BASEURL=https://github.com/up9cloud/gocron2
@@ -15,8 +15,9 @@ 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
+	wget ${CERTSTRAP_DOWNLOAD_URL} -O certstrap; \
+	chmod +x certstrap; \
+	chown -R root:root .
 
 FROM sstc/headful-chromium:ubuntu-24
 RUN set -ex; \
@@ -30,17 +31,17 @@ RUN set -ex; \
 		jq \
 		; \
 	# In the mean time, install all popular scripting languages
-	curl -fsSL https://deb.nodesource.com/setup_lts.x | bash -; \
+	# curl -fsSL https://deb.nodesource.com/setup_lts.x | bash -; \
 	DEBIAN_FRONTEND=noninteractive apt install --no-install-recommends -y \
-		nodejs \
-		npm \
+	#	nodejs \
+	#	npm \
 		php \
 		ruby \
 		lua5.4 \
 		; \
 	bash --version; \
 	perl --version; \
-	python2 --version; \
+	# python2 --version; \
 	python3 --version; \
 	node -v; \
 	npm -v; \
diff --git a/run-all.sh b/run-all.sh
index 265504d..8c5b0af 100755
--- a/run-all.sh
+++ b/run-all.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-./gocron web &
-./gocron-node -allow-root &
+./gocron2 web &
+./gocron2-node -allow-root &
 wait -n
 exit $?
diff --git a/server/Dockerfile b/server/Dockerfile
index 0459b3d..0ce60e1 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.7 AS builder
+FROM alpine:3.20 AS builder
 
 ENV GOCRON2_VERSION=1.6.2
 ENV GOCRON2_REPO_BASEURL=https://github.com/up9cloud/gocron2
@@ -15,8 +15,9 @@ 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
+	wget ${CERTSTRAP_DOWNLOAD_URL} -O certstrap; \
+	chmod +x certstrap; \
+	chown -R root:root .
 
 FROM scratch