From f759fa5873c670f7a2cc15cfb57b5946ca77dac9 Mon Sep 17 00:00:00 2001 From: eitsupi Date: Fri, 1 Apr 2022 16:20:13 +0000 Subject: [PATCH 1/3] separate test workflow for bake files from lint workflow --- .github/workflows/bakefile-test.yml | 18 ++++++++++++++++++ .github/workflows/linting.yml | 8 -------- 2 files changed, 18 insertions(+), 8 deletions(-) create mode 100644 .github/workflows/bakefile-test.yml diff --git a/.github/workflows/bakefile-test.yml b/.github/workflows/bakefile-test.yml new file mode 100644 index 00000000..00c92915 --- /dev/null +++ b/.github/workflows/bakefile-test.yml @@ -0,0 +1,18 @@ +name: test for docker-bake.json + +on: + pull_request: + branches: + - master + paths: + - bakefiles/*.json + workflow_dispatch: + +jobs: + make_test: + runs-on: ubuntu-latest + steps: + - name: Check out code + uses: actions/checkout@v2 + - name: Run make test + run: make test diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml index 4868aa64..61ad36eb 100644 --- a/.github/workflows/linting.yml +++ b/.github/workflows/linting.yml @@ -23,11 +23,3 @@ jobs: DEFAULT_BRANCH: master LINTER_RULES_PATH: . GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - make_test: - runs-on: ubuntu-latest - steps: - - name: Check out code - uses: actions/checkout@v2 - - name: Run make test - run: make test From 5dfd9453cdbbac1076629111959c2778ccafeef8 Mon Sep 17 00:00:00 2001 From: eitsupi Date: Fri, 1 Apr 2022 16:21:19 +0000 Subject: [PATCH 2/3] rename bionic images --- stacks/4.0.0.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/stacks/4.0.0.json b/stacks/4.0.0.json index 5d0c836e..9766f9a5 100644 --- a/stacks/4.0.0.json +++ b/stacks/4.0.0.json @@ -11,7 +11,7 @@ ], "bionicimages": [ { - "targets": ["r-ver-ubuntu18.04", "rstudio-ubuntu18.04", "tidyverse-ubuntu18.04", "verse-ubuntu18.04", "geospatial-ubuntu18.04"] + "targets": ["r-ver-bionic", "rstudio-bionic", "tidyverse-bionic", "verse-bionic", "geospatial-bionic"] } ] } @@ -248,7 +248,7 @@ ] }, { - "IMAGE": "r-ver-ubuntu18.04", + "IMAGE": "r-ver-bionic", "labels": { "org.opencontainers.image.title": "rocker/r-ver", "org.opencontainers.image.description": "Reproducible builds to fixed version of R" @@ -280,7 +280,7 @@ ] }, { - "IMAGE": "rstudio-ubuntu18.04", + "IMAGE": "rstudio-bionic", "labels": { "org.opencontainers.image.title": "rocker/rstudio", "org.opencontainers.image.description": "RStudio Server with fixed version of R" @@ -304,7 +304,7 @@ ] }, { - "IMAGE": "tidyverse-ubuntu18.04", + "IMAGE": "tidyverse-bionic", "labels": { "org.opencontainers.image.title": "rocker/tidyverse", "org.opencontainers.image.description": "Version-stable build of R, RStudio Server, and R packages." @@ -316,7 +316,7 @@ ] }, { - "IMAGE": "verse-ubuntu18.04", + "IMAGE": "verse-bionic", "labels": { "org.opencontainers.image.title": "rocker/verse", "org.opencontainers.image.description": "Adds tex & related publishing packages to version-locked tidyverse image." @@ -332,7 +332,7 @@ ] }, { - "IMAGE": "geospatial-ubuntu18.04", + "IMAGE": "geospatial-bionic", "labels": { "org.opencontainers.image.title": "rocker/geospatial", "org.opencontainers.image.description": "Docker-based Geospatial toolkit for R, built on versioned Rocker image." From 8e425ba87372d9ebb2e6d686a9db9f11d8af77d0 Mon Sep 17 00:00:00 2001 From: eitsupi Date: Fri, 1 Apr 2022 16:21:40 +0000 Subject: [PATCH 3/3] update files by `make setup` --- bakefiles/4.0.0.docker-bake.json | 30 +++++++++---------- ...ile => geospatial-bionic_4.0.0.Dockerfile} | 0 ...ckerfile => r-ver-bionic_4.0.0.Dockerfile} | 0 ...erfile => rstudio-bionic_4.0.0.Dockerfile} | 0 ...file => tidyverse-bionic_4.0.0.Dockerfile} | 0 ...ckerfile => verse-bionic_4.0.0.Dockerfile} | 0 6 files changed, 15 insertions(+), 15 deletions(-) rename dockerfiles/{geospatial-ubuntu18.04_4.0.0.Dockerfile => geospatial-bionic_4.0.0.Dockerfile} (100%) rename dockerfiles/{r-ver-ubuntu18.04_4.0.0.Dockerfile => r-ver-bionic_4.0.0.Dockerfile} (100%) rename dockerfiles/{rstudio-ubuntu18.04_4.0.0.Dockerfile => rstudio-bionic_4.0.0.Dockerfile} (100%) rename dockerfiles/{tidyverse-ubuntu18.04_4.0.0.Dockerfile => tidyverse-bionic_4.0.0.Dockerfile} (100%) rename dockerfiles/{verse-ubuntu18.04_4.0.0.Dockerfile => verse-bionic_4.0.0.Dockerfile} (100%) diff --git a/bakefiles/4.0.0.docker-bake.json b/bakefiles/4.0.0.docker-bake.json index dfcec099..475aeb4c 100644 --- a/bakefiles/4.0.0.docker-bake.json +++ b/bakefiles/4.0.0.docker-bake.json @@ -21,11 +21,11 @@ "bionicimages": [ { "targets": [ - "r-ver-ubuntu18.04", - "rstudio-ubuntu18.04", - "tidyverse-ubuntu18.04", - "verse-ubuntu18.04", - "geospatial-ubuntu18.04" + "r-ver-bionic", + "rstudio-bionic", + "tidyverse-bionic", + "verse-bionic", + "geospatial-bionic" ] } ] @@ -278,9 +278,9 @@ "" ] }, - "r-ver-ubuntu18.04": { + "r-ver-bionic": { "context": "./", - "dockerfile": "dockerfiles/r-ver-ubuntu18.04_4.0.0.Dockerfile", + "dockerfile": "dockerfiles/r-ver-bionic_4.0.0.Dockerfile", "labels": { "org.opencontainers.image.title": "rocker/r-ver", "org.opencontainers.image.description": "Reproducible builds to fixed version of R", @@ -300,9 +300,9 @@ "type=inline" ] }, - "rstudio-ubuntu18.04": { + "rstudio-bionic": { "context": "./", - "dockerfile": "dockerfiles/rstudio-ubuntu18.04_4.0.0.Dockerfile", + "dockerfile": "dockerfiles/rstudio-bionic_4.0.0.Dockerfile", "labels": { "org.opencontainers.image.title": "rocker/rstudio", "org.opencontainers.image.description": "RStudio Server with fixed version of R", @@ -322,9 +322,9 @@ "" ] }, - "tidyverse-ubuntu18.04": { + "tidyverse-bionic": { "context": "./", - "dockerfile": "dockerfiles/tidyverse-ubuntu18.04_4.0.0.Dockerfile", + "dockerfile": "dockerfiles/tidyverse-bionic_4.0.0.Dockerfile", "labels": { "org.opencontainers.image.title": "rocker/tidyverse", "org.opencontainers.image.description": "Version-stable build of R, RStudio Server, and R packages.", @@ -344,9 +344,9 @@ "" ] }, - "verse-ubuntu18.04": { + "verse-bionic": { "context": "./", - "dockerfile": "dockerfiles/verse-ubuntu18.04_4.0.0.Dockerfile", + "dockerfile": "dockerfiles/verse-bionic_4.0.0.Dockerfile", "labels": { "org.opencontainers.image.title": "rocker/verse", "org.opencontainers.image.description": "Adds tex & related publishing packages to version-locked tidyverse image.", @@ -366,9 +366,9 @@ "" ] }, - "geospatial-ubuntu18.04": { + "geospatial-bionic": { "context": "./", - "dockerfile": "dockerfiles/geospatial-ubuntu18.04_4.0.0.Dockerfile", + "dockerfile": "dockerfiles/geospatial-bionic_4.0.0.Dockerfile", "labels": { "org.opencontainers.image.title": "rocker/geospatial", "org.opencontainers.image.description": "Docker-based Geospatial toolkit for R, built on versioned Rocker image.", diff --git a/dockerfiles/geospatial-ubuntu18.04_4.0.0.Dockerfile b/dockerfiles/geospatial-bionic_4.0.0.Dockerfile similarity index 100% rename from dockerfiles/geospatial-ubuntu18.04_4.0.0.Dockerfile rename to dockerfiles/geospatial-bionic_4.0.0.Dockerfile diff --git a/dockerfiles/r-ver-ubuntu18.04_4.0.0.Dockerfile b/dockerfiles/r-ver-bionic_4.0.0.Dockerfile similarity index 100% rename from dockerfiles/r-ver-ubuntu18.04_4.0.0.Dockerfile rename to dockerfiles/r-ver-bionic_4.0.0.Dockerfile diff --git a/dockerfiles/rstudio-ubuntu18.04_4.0.0.Dockerfile b/dockerfiles/rstudio-bionic_4.0.0.Dockerfile similarity index 100% rename from dockerfiles/rstudio-ubuntu18.04_4.0.0.Dockerfile rename to dockerfiles/rstudio-bionic_4.0.0.Dockerfile diff --git a/dockerfiles/tidyverse-ubuntu18.04_4.0.0.Dockerfile b/dockerfiles/tidyverse-bionic_4.0.0.Dockerfile similarity index 100% rename from dockerfiles/tidyverse-ubuntu18.04_4.0.0.Dockerfile rename to dockerfiles/tidyverse-bionic_4.0.0.Dockerfile diff --git a/dockerfiles/verse-ubuntu18.04_4.0.0.Dockerfile b/dockerfiles/verse-bionic_4.0.0.Dockerfile similarity index 100% rename from dockerfiles/verse-ubuntu18.04_4.0.0.Dockerfile rename to dockerfiles/verse-bionic_4.0.0.Dockerfile