Switch to GHA and GHCR for image building and hosting

.github/workflows/imagebuild.yml

@@ -0,0 +1,133 @@
+name: Build and Push Georust Docker Images
+
+on:
+  push:
+    tags-ignore:
+      - '**'
+    branches:
+      - main
+      - staging
+      - trying
+  pull_request:
+  merge_group:
+
+env:
+  LIBPROJ_VERSION: 9.4.0
+  MAIN_IMAGE_NAME: libproj-builder
+
+jobs:
+  build_main_image:
+    name: Build the main image for geo and proj
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        rust_version: ["1.70", 1.76, 1.77]
+
+    steps:
+    - name: Check out repository
+      uses: actions/checkout@v4
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+
+    - name: Login to GitHub Container Registry
+      uses: docker/login-action@v3
+      with:
+        registry: ghcr.io
+        username: ${{ github.repository_owner }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Set Up Builder
+      run: |
+        docker buildx create --name mybuilder
+        docker buildx use mybuilder
+        docker buildx inspect --bootstrap
+
+    - name: Build and export main image to Docker
+      uses: docker/build-push-action@v5
+      with:
+        file: ./dockerfiles/${{ env.MAIN_IMAGE_NAME }}
+        push: false
+        load: true
+        platforms: linux/amd64
+        tags: ghcr.io/${{ github.repository_owner }}/${{ env.MAIN_IMAGE_NAME }}:proj-${{ env.LIBPROJ_VERSION }}-rust-${{ matrix.rust_version }}
+        build-args: |
+              RUST_VERSION=${{ matrix.rust_version }}
+              PROJ_VERSION=${{ env.LIBPROJ_VERSION }}
+
+    - name: Push main image
+      uses: docker/build-push-action@v5
+      with:
+        file: ./dockerfiles/${{ env.MAIN_IMAGE_NAME }}
+        push: true
+        load: false
+        # platforms: linux/amd64,linux/arm64
+        tags: ghcr.io/${{ github.repository_owner }}/${{ env.MAIN_IMAGE_NAME }}:proj-${{ env.LIBPROJ_VERSION }}-rust-${{ matrix.rust_version }}
+        outputs: type=docker,dest=/tmp/${{ env.MAIN_IMAGE_NAME }}-proj-${{ env.LIBPROJ_VERSION }}-rust-${{ matrix.rust_version }}.tar
+        build-args: |
+              RUST_VERSION=${{ matrix.rust_version }}
+              PROJ_VERSION=${{ env.LIBPROJ_VERSION }}
+
+  build_dependent_images:
+    name: Build dependent images for geo and proj
+    needs: build_main_image
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        subimages: [
+          {image: geo-ci, testcmd: "git clone https://github.com/georust/geo && cd geo && cargo test --no-default-features && cargo test && cargo test --all-features"},
+          {image: proj-ci, testcmd: "git clone https://github.com/georust/proj && cd proj && cargo test --no-default-features && cargo test --features bundled_proj && cargo test --features network && cd proj-sys && _PROJ_SYS_TEST_EXPECT_BUILD_FROM_SRC=0 cargo test && _PROJ_SYS_TEST_EXPECT_BUILD_FROM_SRC=1 cargo test --features bundled_proj"},
+          {image: proj-ci-without-system-proj, testcmd: "git clone https://github.com/georust/proj && cd proj && cargo test --features bundled_proj && cd proj-sys && _PROJ_SYS_TEST_EXPECT_BUILD_FROM_SRC=1 cargo test"}
+          ]
+        rust_version: ["1.70", 1.76, 1.77]
+
+    steps:
+    - name: Check out repository
+      uses: actions/checkout@v4
+
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+
+    - name: Login to GitHub Container Registry
+      uses: docker/login-action@v3
+      with:
+        registry: ghcr.io
+        username: ${{ github.repository_owner }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Set Up Builder
+      run: |
+        docker buildx create --name mybuilder
+        docker buildx use mybuilder
+        docker buildx inspect --bootstrap
+
+    - name: Build ${{ matrix.subimages.image }}
+      uses: docker/build-push-action@v5
+      with:
+        file: ./dockerfiles/${{ matrix.subimages.image }}
+        push: false
+        load: true
+        platforms: linux/amd64
+        tags: ghcr.io/${{ github.repository_owner }}/${{ matrix.subimages.image }}:proj-${{ env.LIBPROJ_VERSION }}-rust-${{ matrix.rust_version }}
+        build-args: |
+              RUST_VERSION=${{ matrix.rust_version }}
+              PROJ_VERSION=${{ env.LIBPROJ_VERSION }}
+
+    - name: Test ${{ matrix.subimages.image }}
+      run: |
+        docker run --rm ghcr.io/${{ github.repository_owner }}/${{ matrix.subimages.image }}:proj-${{ env.LIBPROJ_VERSION }}-rust-${{ matrix.rust_version }} /bin/bash -c "${{ matrix.subimages.testcmd }}"
+
+    - name: Push tested ${{ matrix.subimages.image }} image
+      uses: docker/build-push-action@v5
+      with:
+        file: ./dockerfiles/${{ matrix.subimages.image }}
+        push: true
+        load: false
+        # platforms: linux/amd64,linux/arm64
+        tags: ghcr.io/${{ github.repository_owner }}/${{ matrix.subimages.image }}:proj-${{ env.LIBPROJ_VERSION }}-rust-${{ matrix.rust_version }}
+        outputs: type=docker,dest=/tmp/${{ matrix.subimages.image }}-proj-${{ env.LIBPROJ_VERSION }}-rust-${{ matrix.rust_version }}.tar
+        build-args: |
+              RUST_VERSION=${{ matrix.rust_version }}
+              PROJ_VERSION=${{ env.LIBPROJ_VERSION }}

README.md

@@ -30,59 +30,30 @@ number tag as well, e.g. `rust:1.45.1`. Similarly we could publish a new tag
 for each minor patch (`geo-ci:rust-1.50.0`, `geo-ci:rust-1.50.1`, etc.), but
 running CI against each patch seems like overkill at this point.
 
-## How to Update Rust
+**New images are built by Github Actions and published to the Github Container Registry if tests pass**
 
-### Prerequisites
+## How to Update the Rust Version
 
-It's assumed that you have a directory structure containing dependent georust repositories like this:
 
-  $ ls
-  docker-containers  # this repository
-  geo                # needed to run tests
-  proj               # needed to run tests
+### Add a new Rust version
 
-### add a new Rust version
+edit the `.github/workflows/imagebuild.yml` file
 
-    echo "1.69" >> rust-versions.txt
+Add the Rust version you wish to add to the **two** `rust_version` matrices:  
 
-    # build containers
-    ./run-rust.sh 1.69 -- make build-all
+#### Example
 
-    # run some tests on the new containers
-    ./run-rust.sh 1.69 -- make test-all
-
-    # If everythig looks good, you can publish the new tags
-    ./run-rust.sh 1.69 -- make publish-all
-
-    # delete any old unsupported rust versions from the file
-    edit rust-versions.txt
-
-### To update multiple Rust versions in parallel
-
-If you have multiple versions of rust you want to build/test/publish:
-
-    ./run-rust.sh 1.49 1.50 -- make build-all
-
-For more:
-    ./run-rust.sh --help
+    Before:  rust_version: [1.74, 1.75, 1.76]
+    After:  rust_version: [1.74, 1.75, 1.76, 1.77]
 
 ## How to Update Proj
 
 libproj (the cpp lib) is built using the [docker container builder
 pattern](https://docs.docker.com/develop/develop-images/multistage-build/), and
 then reused by multiple CI containers.
 
-    edit proj-version.txt
-
-    # All containers will need to be rebuilt when updating proj
-    ./run-rust.sh --all -- make build-all
+    edit the `LIBPROJ_VERSION` variable in `imagebuild.yml`
 
-    # NOTE: I often see intermittent failures when running all the tests at once, but
-    # haven't found time to dig into why this is happening.
-    # I typically re-run failed tests by themselves to see if the failures recurs.
-    ./run-rust.sh --all -- make test-all
-
-    ./run-rust.sh --all -- make publish-all
 
 ### Update the `proj` crate
 
@@ -94,14 +65,3 @@ then reused by multiple CI containers.
 
 - When the PR has merged and the `proj` crate has been published, you can update [geo](https://github.com/georust/geo) to use the new `proj` crate:
 
-### Publishing docker containers
-
-To publish all the containers for a version of rust:
-
-    # e.g. to publish geo-ci:rust-1.58, proj-ci:rust-1.58, etc.
-    ./run-rust.sh 1.58 -- make publish-all
-
-You can quickly publish multiple versions like this:
-
-    ./run-rust.sh 1.58 1.59 -- make publish-all
-

dockerfiles/geo-ci.Dockerfile → dockerfiles/geo-ci

@@ -1,4 +1,4 @@
-# https://hub.docker.com/orgs/georust/geo-ci
+# https://github.com/orgs/georust/packages/container/package/geo-ci
 
 # ------------------------------------------------------------------------------
 # Final stage
@@ -7,7 +7,7 @@
 ARG RUST_VERSION
 ARG PROJ_VERSION
 
-FROM georust/libproj-builder:proj-${PROJ_VERSION}-rust-${RUST_VERSION} as libproj-builder
+FROM ghcr.io/georust/libproj-builder:proj-${PROJ_VERSION}-rust-${RUST_VERSION} as libproj-builder
 FROM rust:$RUST_VERSION-bullseye
 
 ARG RUST_VERSION
@@ -21,6 +21,7 @@ RUN apt-get update \
   && DEBIAN_FRONTEND="noninteractive" apt-get install -y --no-install-recommends \
     ca-certificates \
     clang \
+    cmake \
     git \
     libtiff-dev \
     pkg-config \

dockerfiles/libproj-builder.Dockerfile → dockerfiles/libproj-builder

@@ -1,4 +1,4 @@
-# https://hub.docker.com/orgs/georust/libproj-builder
+# https://github.com/orgs/georust/packages/container/package/libproj-builder
 
 # Builds libproj from source
 
@@ -14,6 +14,7 @@ RUN test -n "$PROJ_VERSION" || (echo "PROJ_VERSION ARG not set" && false)
 RUN apt-get update \
   && DEBIAN_FRONTEND="noninteractive" apt-get install -y \
     clang \
+    git \
     libcurl4-gnutls-dev \
     libsqlite3-dev \
     libtiff-dev \

dockerfiles/proj-ci.Dockerfile → dockerfiles/proj-ci

@@ -1,8 +1,8 @@
-# https://hub.docker.com/orgs/georust/proj-ci
+# https://github.com/orgs/georust/packages/container/package/proj-ci
 
 ARG RUST_VERSION
 ARG PROJ_VERSION
-FROM georust/libproj-builder:proj-${PROJ_VERSION}-rust-${RUST_VERSION}
+FROM ghcr.io/georust/libproj-builder:proj-${PROJ_VERSION}-rust-${RUST_VERSION}
 
 ARG RUST_VERSION
 ARG PROJ_VERSION
@@ -12,6 +12,7 @@ RUN test -n "$PROJ_VERSION" || (echo "PROJ_VERSION ARG not set" && false)
 RUN apt-get update \
   && DEBIAN_FRONTEND="noninteractive" apt-get install -y --no-install-recommends \
     clang \
+    cmake \
   && rm -rf /var/lib/apt/lists/*
 
 RUN cp -r /build/usr/* /usr

dockerfiles/proj-ci-without-system-proj.Dockerfile → dockerfiles/proj-ci-without-system-proj

@@ -1,4 +1,4 @@
-# https://hub.docker.com/orgs/georust/proj-ci-without-system-proj
+# https://github.com/orgs/georust/packages/container/package/proj-ci-without-system-proj
 
 # This container is based on the libproj-builder container, which has built
 # libproj, and thus has all the dependencies for building proj from source, but
@@ -7,7 +7,7 @@
 ARG RUST_VERSION
 ARG PROJ_VERSION
 
-FROM georust/libproj-builder:proj-${PROJ_VERSION}-rust-${RUST_VERSION}
+FROM ghcr.io/georust/libproj-builder:proj-${PROJ_VERSION}-rust-${RUST_VERSION}
 
 ARG RUST_VERSION
 ARG PROJ_VERSION