gocron2

Author: up9cloud

.github/workflows/main.yml

@@ -4,40 +4,40 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - id: meta
-      uses: docker/metadata-action@v3
+      uses: docker/metadata-action@v5
       with:
         images: |
-          sstc/gocron
+          sstc/gocron2
         tags: |
           type=raw,value=latest
-          type=raw,value=scratch
-    - uses: docker/setup-qemu-action@v2
-    - uses: docker/setup-buildx-action@v2
-    - uses: docker/login-action@v1
+          type=raw,value=all
+    - uses: docker/setup-qemu-action@v3
+    - uses: docker/setup-buildx-action@v3
+    - uses: docker/login-action@v3
       with:
         username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}
-    - name: :scratch
-      uses: docker/build-push-action@v4
+    - name: :all
+      uses: docker/build-push-action@v6
       with:
         push: true
         platforms: linux/amd64,linux/arm64
-        file: ./scratch/Dockerfile
+        file: ./all/Dockerfile
         tags: ${{ steps.meta.outputs.tags }}
-    - name: :all
-      uses: docker/build-push-action@v4
+    - name: :server
+      uses: docker/build-push-action@v6
       with:
         push: true
         platforms: linux/amd64,linux/arm64
-        file: ./all/Dockerfile
-        tags: sstc/gocron:all
-    - uses: actions/checkout@v2
+        file: ./server/Dockerfile
+        tags: sstc/gocron:server
+    - uses: actions/checkout@v4
     - uses: christian-korneck/update-container-description-action@v1
       env:
         DOCKER_USER: ${{ secrets.DOCKERHUB_USERNAME }}
         DOCKER_PASS: ${{ secrets.DOCKERHUB_PASSWORD }}
       with:
-        destination_container_repo: sstc/gocron
+        destination_container_repo: sstc/gocron2
         short_description: https://github.com/${{ github.repository }}
     - uses: up9cloud/action-notify@master
       if: cancelled() == false

Dockerfile-0

@@ -1,22 +1,19 @@
-FROM golang:1.19 as builder
+FROM alpine:3.7 AS builder
 
-ENV GOCRON_VERSION=1.5.3
-ENV GOCRON_SOURCE_DOWNLOAD_URL=https://github.com/ouqiang/gocron/archive/refs/tags/v${GOCRON_VERSION}.tar.gz
-ENV GOCRON_DOWNLOAD_URL=https://github.com/ouqiang/gocron/releases/download/v${GOCRON_VERSION}/gocron-node-v${GOCRON_VERSION}-linux-amd64.tar.gz
-ENV GOCRON_NODE_DOWNLOAD_URL=https://github.com/ouqiang/gocron/releases/download/v${GOCRON_VERSION}/gocron-v${GOCRON_VERSION}-linux-amd64.tar.gz
+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_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_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
 
 WORKDIR /tmp
 RUN set -ex; \
-	apt-get update; \
-	apt-get install -y \
-	nodejs npm \
-	; \
-	apt-get remove cmdtest; \
-	npm install -g yarn; \
-	git clone https://github.com/up9cloud/gocron.git; \
-	# git checkout tags/v${GOCRON_VERSION}; \
-	# curl -sSL ${GOCRON_SOURCE_DOWNLOAD_URL} -o gocron.tar.gz; \
-	# tar -xvf gocron.tar.gz; \
-	cd gocron
+    wget ${GOCRON2_DOWNLOAD_URL}; \
+    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

Dockerfile-1-build

@@ -1,42 +1,51 @@
-${TEMPLATE_0}
-${TEMPLATE_1}
-${TEMPLATE_2}
+${PARTIAL_0}
 
-FROM ${ALL_IMAGE}
+FROM sstc/headful-chromium:ubuntu-24
 RUN set -ex; \
-	apt-get update; \
-	DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
+	apt update; \
+	DEBIAN_FRONTEND=noninteractive apt install --no-install-recommends -y \
 		tini \
 		iputils-ping \
 		dnsutils \
 		rsync \
 		curl \
 		jq \
-	; \
-	# In the mean time, install all famous script languages
+		; \
+	# In the mean time, install all popular scripting languages
 	curl -fsSL https://deb.nodesource.com/setup_lts.x | bash -; \
-	DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
+	DEBIAN_FRONTEND=noninteractive apt install --no-install-recommends -y \
+		nodejs \
+		npm \
 		php \
 		ruby \
-		lua5.3 \
-	; \
-	apt-get clean; \
+		lua5.4 \
+		; \
+	bash --version; \
+	perl --version; \
+	python2 --version; \
+	python3 --version; \
+	node -v; \
+	npm -v; \
+	php -v; \
+	ruby -v; \
+	lua -v; \
+	apt clean; \
 	rm -rf /var/lib/apt/lists/*
 
+# https://npmtrends.com/axios-vs-got-vs-node-fetch-vs-request-vs-superagent
 RUN set -e; \
 	npm -g install \
 		node-fetch
 
-ENTRYPOINT ["tini", "--"]
-
-COPY --from=builder /tmp/gocron/bin/gocron /gocron/gocron
-COPY --from=builder /tmp/gocron/bin/gocron-node /gocron/gocron-node
-COPY --from=builder /tmp/certstrap /gocron/certstrap
-COPY gocron-all.sh /gocron/gocron-all.sh
-COPY init-cert.sh /gocron/init-cert.sh
+WORKDIR /gocron2
+COPY --from=builder /tmp/gocron2 /gocron2/gocron2
+COPY --from=builder /tmp/gocron2-node /gocron2/gocron2-node
+COPY --from=builder /tmp/certstrap /gocron2/certstrap
+COPY run-all.sh /gocron2/run-all.sh
+COPY init-cert.sh /gocron2/init-cert.sh
 
-WORKDIR /gocron
-VOLUME [ "/gocron/conf", "/gocron/log", "/gocron/out" ]
+VOLUME [ "/gocron2/conf", "/gocron2/log", "/gocron2/out", "/app" ]
 EXPOSE 5920
 EXPOSE 5921
-CMD ["/gocron/gocron-all.sh"]
+ENTRYPOINT ["tini", "--"]
+CMD ["/gocron2/run-all.sh"]

Dockerfile-2-download

@@ -0,0 +1,10 @@
+${PARTIAL_0}
+
+FROM scratch
+
+WORKDIR /gocron2
+COPY --from=builder /tmp/gocron2 /gocron2/gocron2
+
+VOLUME [ "/gocron2/conf", "/gocron2/log", "/gocron2/out" ]
+EXPOSE 5920
+CMD [ "/gocron2/gocron2", "web" ]

Dockerfile-all.template

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 ~ Present https://github.com/up9cloud
+Copyright (c) 2024 ~ Present https://github.com/up9cloud
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Dockerfile-scratch.template

@@ -1,82 +1,79 @@
-# docker-gocron
+# docker-gocron2
 
 ## Usage
 
-> Simple way: gocron and gocron-node in same container
+> One container: gocron2 and gocron2-node are in the same container
 
 ```bash
-# Step 1: Up
+# Up gocron2 and gocron2-node
 docker run -d --rm \
-  -v /path/to/conf:/gocron/conf \
-  -v /path/to/log:/gocron/log \
+  -v /path/to/conf:/gocron2/conf \
+  -v /path/to/log:/gocron2/log \
   -v /my/task-scripts:/app \
   -p 5920:5920 \
-  sstc/gocron:all
+  sstc/gocron2
 
-# Step 2: Open 127.0.0.1:5920 to install
+# Open 127.0.0.1:5920 to install
 ```
 
-> Hard ways: gocron and gocron-node are in the different containers, but they're on same host
+> One host: gocron2 and gocron2-node are in the different containers, but on the same host
 
 ```bash
-# Step 1: Up gocron
-docker run -d --name gocron \
-  -v /path/to/conf:/gocron/conf \
-  -v /path/to/log:/gocron/log \
+# Up gocron2
+docker run -d --name gocron2 \
+  -v /path/to/conf:/gocron2/conf \
+  -v /path/to/log:/gocron2/log \
   --net host \
-  sstc/gocron:latest
+  sstc/gocron2:server
 
-# Step 2: Open 127.0.0.1:5920 to install
-
-# Step 3: Up gocron-node
-docker run -d --name gocron-node \
+# Up gocron2-node
+docker run -d --name gocron2-node \
   -v /path/to/my-task-scripts:/app \
   --net host \
-  sstc/gocron:all gocron-node -allow-root
+  sstc/gocron2 /gocron2/gocron2-node -allow-root
+
+# Open 127.0.0.1:5920 to install
 ```
 
-> Multiple nodes
+> Multiple nodes with certs
 
 ```bash
-# Step 1: Create certs for main node
+# Create certs for main node
 docker run --rm \
-  -v /path/to/out:/gocron/out \
-  sstc/gocron:all ./init-cert.sh
+  -v /path/to/out:/gocron2/out \
+  sstc/gocron2 ./init-cert.sh
 
-# Step 2: Create certs for worker nodes, do it multiple times with all ips of nodes
+# Create certs for worker nodes
 docker run --rm \
-  -v /path/to/out:/gocron/out \
-  sstc/gocron:all ./init-cert.sh 1.2.3.4
-
-# Step 3: Up main node
-docker run -d --name gocron \
-  -v /path/to/conf:/gocron/conf \
-  -v /path/to/log:/gocron/log \
-  -v /path/to/out:/gocron/out \
-  -p 5920:5920 \
-  sstc/gocron:latest
-
-# Step 4: Open 127.0.0.1:5920 to install
+  -v /path/to/out:/gocron2/out \
+  sstc/gocron2 ./init-cert.sh 1.2.3.4
 
-# Step 5: Add those to /path/to/conf/app.ini
+# Configure main node: add those to /path/to/conf/app.ini
 #   enable_tls = true
-#   ca_file    = /gocron/out/Root_CA.crt
-#   cert_file  = /gocron/out/127.0.0.1.crt
-#   key_file   = /gocron/out/127.0.0.1.key
-
-# Step 6: Restart main node
-docker restart gocron
+#   ca_file    = /gocron2/out/Root_CA.crt
+#   cert_file  = /gocron2/out/127.0.0.1.crt
+#   key_file   = /gocron2/out/127.0.0.1.key
+
+# Up main node
+docker run -d --name gocron2 \
+  -v /path/to/conf:/gocron2/conf \
+  -v /path/to/log:/gocron2/log \
+  -v /path/to/out:/gocron2/out \
+  -p 5920:5920 \
+  sstc/gocron2:server
 
-# Step 7: Copy necessary files in /path/to/out to hosts of worker nodes
+# Copy cert files in /path/to/out for the worker nodes
 
-# Step 6: Go to hosts and run, do this multiple times to up all worker nodes
-docker run -d --name gocron-node \
-  -v /path/to/out:/gocron/out \
+# Up all worker nodes
+docker run -d --name gocron2-node \
+  -v /path/to/out:/gocron2/out \
   -v /path/to/my-task-scripts:/app \
   -p 5921:5921 \
-  sstc/gocron:all gocron-node -allow-root \
+  sstc/gocron2 gocron2-node -allow-root \
   -enable-tls \
-  -ca-file /gocron/out/Root_CA.crt \
-  -cert-file /gocron/out/1.2.3.4.crt \
-  -key-file /gocron/out/1.2.3.4.key
+  -ca-file /gocron2/out/Root_CA.crt \
+  -cert-file /gocron2/out/1.2.3.4.crt \
+  -key-file /gocron2/out/1.2.3.4.key
+
+# Open 127.0.0.1:5920 to install
 ```