diff --git a/.forgejo/workflows/ci.yml b/.forgejo/workflows/ci.yml index 6d4b7db..9f0a79d 100644 --- a/.forgejo/workflows/ci.yml +++ b/.forgejo/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: backend: runs-on: docker container: - image: forgejo.okit.pl/oskar/ci-gradle-node:8.7 + image: forgejo.okit.pl/oskar/ci-gradle-node:8.7-jdk17 steps: - uses: actions/checkout@v4 diff --git a/ci/images/gradle-node/Dockerfile-jdk17 b/ci/images/gradle-node/Dockerfile-jdk17 new file mode 100644 index 0000000..717599c --- /dev/null +++ b/ci/images/gradle-node/Dockerfile-jdk17 @@ -0,0 +1,9 @@ +FROM gradle:8.12-jdk17 + +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + git ca-certificates curl \ + && curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \ + && apt-get install -y --no-install-recommends nodejs \ + && node --version && npm --version && git --version \ + && rm -rf /var/lib/apt/lists/* diff --git a/ci/images/install_images.sh b/ci/images/install_images.sh index 2f0f25e..1c95519 100755 --- a/ci/images/install_images.sh +++ b/ci/images/install_images.sh @@ -1,11 +1,9 @@ #!/bin/bash -docker build -t forgejo.okit.pl/oskar/ci-gradle-node:8.7 -f ci/images/gradle-node/Dockerfile . -docker build -t forgejo.okit.pl/oskar/ci-flutter-node:stable -f ci/images/flutter-node/Dockerfile . +docker build -t forgejo.okit.pl/oskar/ci-gradle-node:8.7-jdf17 -f ci/images/gradle-node/Dockerfile-jdk17 . -docker login forgejo.okit.pl +#docker login forgejo.okit.pl -docker push forgejo.okit.pl/oskar/ci-gradle-node:8.7 -docker push forgejo.okit.pl/oskar/ci-flutter-node:stable +docker push forgejo.okit.pl/oskar/ci-gradle-node:8.7-jdk17