diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml new file mode 100644 index 0000000..2cd148d --- /dev/null +++ b/.github/workflows/push.yml @@ -0,0 +1,33 @@ + +name: Push Docker Hub + +on: + push: + branches: [ master, main ] + schedule: + # Every sunday at 0:00 + - cron: '0 0 * * 0' +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Set up QEMU + uses: docker/setup-qemu-action@v1 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + - name: Login to DockerHub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Build and push Mainline Debian Version + uses: docker/build-push-action@v2 + with: + context: ./v3.1 + platforms: linux/amd64 + push: true + tags: | + jawg/mapnik3:latest + jawg/mapnik3:3.1 + jawg/mapnik3:3.1-bullseye \ No newline at end of file diff --git a/build_all.sh b/build_all.sh deleted file mode 100755 index d8a4d8e..0000000 --- a/build_all.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -set -e -FROM=0 -TO=1 -for i in $(seq $FROM $TO); do - tag="3.$i" - echo "Building jawg/mapnik3:$tag" - docker build --pull -q -t jawg/mapnik3:$tag v$tag - echo "Pushing jawg/mapnik3:$tag" - docker push jawg/mapnik3:$tag -done -docker tag jawg/mapnik3:3.$TO jawg/mapnik3:latest -docker push jawg/mapnik3:latest diff --git a/v3.1/Dockerfile b/v3.1/Dockerfile index ee292fa..7385418 100644 --- a/v3.1/Dockerfile +++ b/v3.1/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM debian:buster-slim +FROM debian:bullseye-slim ENV MAPNIK_VERSION v3.1.0 @@ -39,21 +39,21 @@ ENV BUILD_DEPENDENCIES="build-essential \ libtiff-dev \ libwebp-dev" -ENV DEPENDENCIES="libboost-filesystem1.67.0 \ - libboost-program-options1.67.0 \ - libboost-regex1.67.0 \ - libboost-thread1.67.0 \ - libboost-system1.67.0 \ +ENV DEPENDENCIES="libboost-filesystem1.74.0 \ + libboost-program-options1.74.0 \ + libboost-regex1.74.0 \ + libboost-thread1.74.0 \ + libboost-system1.74.0 \ libcairo2 \ libfreetype6 \ - libgdal20 \ + libgdal28 \ libharfbuzz-gobject0 \ libharfbuzz-icu0 \ libharfbuzz0b \ - libicu63 \ + libicu67 \ libjpeg62-turbo \ libpq5 \ - libproj13 \ + libproj19 \ librasterlite2-1 \ libsqlite3-0 \ libtiff5 \