diff --git a/.dockerignore b/.dockerignore index 253d5ef..5a6443c 100644 --- a/.dockerignore +++ b/.dockerignore @@ -7,6 +7,6 @@ docs/ CHANGELOG.md CODE_OF_CONDUCT.md CONTRIBUTING.md -docker-compose.test.yml +docker-compose.test.yaml LICENSE README.md diff --git a/.github/workflows/go-test-darwin.yaml b/.github/workflows/go-test-darwin.yaml index d438ac7..72b019b 100644 --- a/.github/workflows/go-test-darwin.yaml +++ b/.github/workflows/go-test-darwin.yaml @@ -13,7 +13,7 @@ jobs: strategy: matrix: go: ["1.21"] - os: [macos-13] + os: [macos-latest] steps: - name: Checkout repository diff --git a/Dockerfile b/Dockerfile index 40a86cc..4b30105 100755 --- a/Dockerfile +++ b/Dockerfile @@ -2,8 +2,8 @@ # Stages # ----------------------------------------------------------------------------- -ARG IMAGE_BUILDER=golang:1.22.3-bullseye -ARG IMAGE_FINAL=senzing/senzingapi-runtime-staging:latest +ARG IMAGE_BUILDER=golang:1.23.2-bullseye +ARG IMAGE_FINAL=senzing/senzingapi-runtime-beta:latest # ----------------------------------------------------------------------------- # Stage: senzingapi_runtime diff --git a/makefiles/darwin.mk b/makefiles/darwin.mk index acd3ea8..804c8c9 100644 --- a/makefiles/darwin.mk +++ b/makefiles/darwin.mk @@ -6,7 +6,6 @@ SENZING_DIR ?= /opt/senzing/er SENZING_TOOLS_SENZING_DIRECTORY ?= $(SENZING_DIR) - LD_LIBRARY_PATH ?= $(SENZING_TOOLS_SENZING_DIRECTORY)/lib:$(SENZING_TOOLS_SENZING_DIRECTORY)/lib/macos DYLD_LIBRARY_PATH := $(LD_LIBRARY_PATH) PATH := $(MAKEFILE_DIRECTORY)/bin:/$(HOME)/go/bin:$(PATH) diff --git a/package.Dockerfile b/package.Dockerfile index 58de98b..fe3f88b 100755 --- a/package.Dockerfile +++ b/package.Dockerfile @@ -2,7 +2,7 @@ # Stages # ----------------------------------------------------------------------------- -ARG IMAGE_BUILDER=golang:1.22.3-bullseye +ARG IMAGE_BUILDER=golang:1.22.4-bullseye ARG IMAGE_FPM=dockter/fpm:latest ARG IMAGE_FINAL=alpine