From 68a52395e32efbeb444e80ef041091674bb812e2 Mon Sep 17 00:00:00 2001 From: Michael Dockter Date: Wed, 18 Dec 2024 14:49:25 -0500 Subject: [PATCH] #4 Fix packages --- .../docker-push-containers-to-dockerhub.yaml | 12 +++++------- Dockerfile | 8 ++++---- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.github/workflows/docker-push-containers-to-dockerhub.yaml b/.github/workflows/docker-push-containers-to-dockerhub.yaml index 3ff71c0..ff488f4 100644 --- a/.github/workflows/docker-push-containers-to-dockerhub.yaml +++ b/.github/workflows/docker-push-containers-to-dockerhub.yaml @@ -1,9 +1,7 @@ name: docker push containers to dockerhub on: - push: - tags: - - "[0-9]+.[0-9]+.[0-9]+" + workflow_dispatch: permissions: contents: read @@ -13,18 +11,18 @@ jobs: runs-on: ubuntu-latest steps: - - name: get repo name + - name: Get repo name id: repo-basename run: | echo "repo=$(basename ${{ github.repository }})" >> "$GITHUB_OUTPUT" shell: bash - - name: build docker image and push to DockerHub + - name: Build docker image and push to DockerHub uses: senzing-factory/github-action-docker-buildx-build@v1 with: - build-options: "--push" + build-options: "-q --push --build-arg SENZING_APT_INSTALL_PACKAGE=senzingsdk-runtime --build-arg SENZING_APT_REPOSITORY_NAME=${{ secrets.SENZING_APT_BETA_REPOSITORY_PACKAGE }} --build-arg SENZING_APT_REPOSITORY_URL=${{ secrets.SENZING_APT_BETA_REPOSITORY_URL }}" image-repository: senzing/${{ steps.repo-basename.outputs.repo }} - image-tag: ${{ github.ref_name }} + image-tag: latest password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }} platforms: "linux/amd64,linux/arm64" username: ${{ secrets.DOCKERHUB_USERNAME }} diff --git a/Dockerfile b/Dockerfile index 857e5a1..26b6b3e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,11 @@ -ARG BASE_IMAGE=debian:11.11-slim@sha256:00558f781b91e90469812bad32002f311ab26ef241b4a1996f6600680ec82f5c +ARG BASE_IMAGE=debian:12-slim FROM ${BASE_IMAGE} # Create the build image. ARG SENZING_ACCEPT_EULA="I_ACCEPT_THE_SENZING_EULA" -ARG SENZING_APT_INSTALL_PACKAGE="senzingapi-runtime" -ARG SENZING_APT_REPOSITORY_NAME="senzingrepo_2.0.0-1_all.deb" +ARG SENZING_APT_INSTALL_PACKAGE="senzingsdk-runtime" +ARG SENZING_APT_REPOSITORY_NAME="senzingrepo_2.0.1-1_all.deb" ARG SENZING_APT_REPOSITORY_URL="https://senzing-production-apt.s3.amazonaws.com" ENV REFRESHED_AT=2024-12-06 @@ -56,7 +56,7 @@ HEALTHCHECK CMD apt list --installed | grep senzingsdk-runtime # Set environment variables for root. -ENV LD_LIBRARY_PATH=/opt/senzing/g2/lib +ENV LD_LIBRARY_PATH=/opt/senzing/er/lib # Runtime execution.