diff --git a/.github/workflows/base.yml b/.github/workflows/base.yml index 4d42e35..a3c5ed6 100644 --- a/.github/workflows/base.yml +++ b/.github/workflows/base.yml @@ -11,33 +11,33 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Parse tag from ref id: vars run: echo "tag=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Login to DockerHub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Login to GHCR (GitHub Packages) - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - name: Build opencpu/base - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v5 with: platforms: linux/amd64,linux/arm64 context: docker/base @@ -48,7 +48,7 @@ jobs: ghcr.io/${{github.repository}}/base:latest - name: Build opencpu/rstudio - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v5 with: platforms: linux/amd64 #rstudio does not support arm64 context: docker/rstudio @@ -59,7 +59,7 @@ jobs: ghcr.io/${{github.repository}}/rstudio:latest - name: Build opencpu/apps - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v5 with: platforms: linux/amd64,linux/arm64 context: docker/apps diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 730bb0f..26f1734 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -28,7 +28,7 @@ jobs: sudo apt-get install -y git curl devscripts equivs gdebi-core - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Update package library if: ${{ github.event.inputs.update }} diff --git a/.github/workflows/cloud.yml b/.github/workflows/cloud.yml index 24f2157..43e3365 100644 --- a/.github/workflows/cloud.yml +++ b/.github/workflows/cloud.yml @@ -11,29 +11,29 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Login to DockerHub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Login to GHCR (GitHub Packages) - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - name: Build opencpu/cloud - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v5 with: context: docker/cloud push: true diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index fe7ee00..27692a1 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -15,26 +15,26 @@ jobs: os: [ 'centos-7', 'rocky-8', 'rocky-9', 'debian-11', 'debian-12', 'fedora', 'ubuntu-20.04', 'ubuntu-22.04', 'ubuntu-24.04'] steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Parse tag from ref id: vars run: echo "tag=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Login to DockerHub - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Login to GHCR (GitHub Packages) - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.actor }} @@ -42,7 +42,7 @@ jobs: - name: Build and push id: docker_build - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v5 with: context: docker/${{ matrix.os }} build-args: | diff --git a/docker/rstudio/Dockerfile b/docker/rstudio/Dockerfile index 352ae3c..fc4a260 100644 --- a/docker/rstudio/Dockerfile +++ b/docker/rstudio/Dockerfile @@ -5,7 +5,7 @@ FROM opencpu/base RUN \ apt-get update && \ apt-get install -y r-base-dev sudo curl git libcurl4-openssl-dev libssl-dev libxml2-dev libssh2-1-dev gdebi-core &&\ - wget --quiet https://download2.rstudio.org/server/jammy/amd64/rstudio-server-2024.04.0-735-amd64.deb &&\ + curl -OLSs https://download2.rstudio.org/server/jammy/amd64/rstudio-server-2024.04.0-735-amd64.deb &&\ gdebi --non-interactive rstudio-server-2024.04.0-735-amd64.deb &&\ rm rstudio-server-2024.04.0-735-amd64.deb