From 223510ece19f9ede0d2855f2d5f561c4871d7007 Mon Sep 17 00:00:00 2001 From: Liam Date: Mon, 25 Sep 2023 02:15:06 +0100 Subject: [PATCH] update action --- .gitea/workflows/publish.yaml | 16 +++++----------- gitea-runner/Java18Dockerfile | 16 ---------------- .../{Node18xDockerfile => NodeLatestDockerfile} | 0 3 files changed, 5 insertions(+), 27 deletions(-) delete mode 100644 gitea-runner/Java18Dockerfile rename gitea-runner/{Node18xDockerfile => NodeLatestDockerfile} (100%) diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml index 8608096..0038713 100644 --- a/.gitea/workflows/publish.yaml +++ b/.gitea/workflows/publish.yaml @@ -1,6 +1,8 @@ Actions name: Publish # hi john on: + schedule: + - cron: "0 0 * * 0" # Every 7 days push: branches: - "master" @@ -42,13 +44,13 @@ jobs: file: ./gitea-runner/DockerDockerfile tags: git.fascinated.cc/fascinated/gitea-runner:docker - - name: Build and Push (Node 18.x) + - name: Build and Push (Node Latest) uses: docker/build-push-action@v4 with: push: true context: ./gitea-runner - file: ./gitea-runner/Node18xDockerfile - tags: git.fascinated.cc/fascinated/gitea-runner:node-18 + file: ./gitea-runner/NodeLatestDockerfile + tags: git.fascinated.cc/fascinated/gitea-runner:node-latest - name: Build and Push (Java 17) uses: docker/build-push-action@v4 @@ -57,11 +59,3 @@ jobs: context: ./gitea-runner file: ./gitea-runner/Java17Dockerfile tags: git.fascinated.cc/fascinated/gitea-runner:java-17 - - - name: Build and Push (Java 18) - uses: docker/build-push-action@v4 - with: - push: true - context: ./gitea-runner - file: ./gitea-runner/Java18Dockerfile - tags: git.fascinated.cc/fascinated/gitea-runner:java-18 diff --git a/gitea-runner/Java18Dockerfile b/gitea-runner/Java18Dockerfile deleted file mode 100644 index 530e22d..0000000 --- a/gitea-runner/Java18Dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -FROM git.rainnny.club/rainnny/gitea-runner:docker - -# Update & Install packages -RUN apt-get update -y \ - && apt-get install lsof curl ca-certificates openssl git tar sqlite3 fontconfig libfreetype6 iproute2 libstdc++6 wget maven libc6-x32 libc6-i386 -y - -# Install NodeJS -RUN curl -sL https://deb.nodesource.com/setup_16.x -o /tmp/nodesource_setup.sh -RUN bash /tmp/nodesource_setup.sh -RUN apt install nodejs -y - -# Install OpenJDK 18 -RUN wget https://download.oracle.com/java/18/latest/jdk-18_linux-x64_bin.deb -RUN dpkg -i jdk-18_linux-x64_bin.deb -RUN update-alternatives --install /usr/bin/java java /usr/lib/jvm/jdk-18/bin/java 1 -RUN java -version \ No newline at end of file diff --git a/gitea-runner/Node18xDockerfile b/gitea-runner/NodeLatestDockerfile similarity index 100% rename from gitea-runner/Node18xDockerfile rename to gitea-runner/NodeLatestDockerfile