diff --git a/.github/workflows/docker-build-container.yaml b/.github/workflows/docker-build-container.yaml index ff59266..5fe1e09 100644 --- a/.github/workflows/docker-build-container.yaml +++ b/.github/workflows/docker-build-container.yaml @@ -22,5 +22,4 @@ jobs: with: image-repository: senzing/${{ steps.repo-basename.outputs.repo }} password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }} - platforms: linux/amd64 username: ${{ secrets.DOCKERHUB_USERNAME }} diff --git a/Dockerfile b/Dockerfile index fc4b1ae..f3da021 100755 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ FROM ${IMAGE_GO_BUILDER} as go_builder ENV REFRESHED_AT=2024-02-07 LABEL Name="senzing/demo-quickstart-builder" \ Maintainer="support@senzing.com" \ - Version="0.0.1" + Version="0.0.4" # Copy local files from the Git repository. @@ -55,10 +55,13 @@ LABEL Name="senzing/demo-quickstart" \ Maintainer="support@senzing.com" \ Version="0.0.1" -# Copy files from prior stage. +# Copy local files from the Git repository. COPY ./rootfs / -COPY --from=go_builder "/output/linux-amd64/demo-quickstart" "/app/demo-quickstart" + +# Copy files from prior stage. + +COPY --from=go_builder "/output/linux/demo-quickstart" "/app/demo-quickstart" # Install packages via apt. diff --git a/Makefile b/Makefile index 6b182f3..b74da1c 100644 --- a/Makefile +++ b/Makefile @@ -35,8 +35,6 @@ GO_ARCH = $(word 2, $(GO_OSARCH)) # Can be overridden with "export" # Example: "export LD_LIBRARY_PATH=/path/to/my/senzing/g2/lib" -LD_LIBRARY_PATH ?= /opt/senzing/g2/lib - # Export environment variables. .EXPORT_ALL_VARIABLES: @@ -82,6 +80,7 @@ $(PLATFORMS): .PHONY: build build: build-osarch-specific + .PHONY: docker-build docker-build: @docker build \