diff --git a/.gitignore b/.gitignore index ffdb6d4..938d36d 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ target/ cover.out coverage.html +coverage.out diff --git a/Dockerfile b/Dockerfile index 78f243a..949cfcc 100755 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ # ----------------------------------------------------------------------------- ARG IMAGE_GO_BUILDER=golang:1.22.3-bullseye -ARG IMAGE_FINAL=senzing/senzingapi-runtime:3.10.1 +ARG IMAGE_FINAL=senzing/senzingapi-runtime-staging:latest # ----------------------------------------------------------------------------- # Stage: senzingapi_runtime @@ -16,7 +16,7 @@ FROM ${IMAGE_FINAL} as senzingapi_runtime # ----------------------------------------------------------------------------- FROM ${IMAGE_GO_BUILDER} as go_builder -ENV REFRESHED_AT=2024-06-01 +ENV REFRESHED_AT=2024-07-01 LABEL Name="senzing/template-go-builder" \ Maintainer="support@senzing.com" \ Version="0.0.1" @@ -50,12 +50,11 @@ RUN mkdir -p /output \ # ----------------------------------------------------------------------------- FROM ${IMAGE_FINAL} as final -ENV REFRESHED_AT=2024-06-01 +ENV REFRESHED_AT=2024-07-01 LABEL Name="senzing/template-go" \ Maintainer="support@senzing.com" \ Version="0.0.1" HEALTHCHECK CMD ["/app/healthcheck.sh"] - USER root # Copy local files from the Git repository. diff --git a/Makefile b/Makefile index d94609a..68e2e62 100644 --- a/Makefile +++ b/Makefile @@ -34,8 +34,8 @@ GO_ARCH = $(word 2, $(GO_OSARCH)) # Conditional assignment. ('?=') # Can be overridden with "export" -LD_LIBRARY_PATH ?= /opt/senzing/g2/lib GOBIN ?= $(shell go env GOPATH)/bin +LD_LIBRARY_PATH ?= /opt/senzing/g2/lib # Export environment variables. diff --git a/docs/README.md b/docs/README.md index e524a22..be6db54 100644 --- a/docs/README.md +++ b/docs/README.md @@ -2,4 +2,4 @@ Placeholder for [GitHub pages](https://pages.github.com/). -See [https://hub.senzing.com/template-go](https://hub.senzing.com/template-go). +See [https://garage.senzing.com/template-go](https://garage.senzing.com/template-go). diff --git a/makefiles/darwin.mk b/makefiles/darwin.mk index 79619d4..cfe7f05 100644 --- a/makefiles/darwin.mk +++ b/makefiles/darwin.mk @@ -25,6 +25,7 @@ clean-osarch-specific: @docker rmi --force $(DOCKER_IMAGE_NAME) $(DOCKER_BUILD_IMAGE_NAME) 2> /dev/null || true @rm -f $(GOPATH)/bin/$(PROGRAM_NAME) || true @rm -f $(MAKEFILE_DIRECTORY)/coverage.html || true + @rm -f $(MAKEFILE_DIRECTORY)/coverage.out || true @rm -f $(MAKEFILE_DIRECTORY)/cover.out || true @rm -fr $(TARGET_DIRECTORY) || true @rm -fr /tmp/sqlite || true diff --git a/makefiles/linux.mk b/makefiles/linux.mk index 13f64a3..842d4d2 100644 --- a/makefiles/linux.mk +++ b/makefiles/linux.mk @@ -21,6 +21,7 @@ clean-osarch-specific: @docker rmi --force $(DOCKER_IMAGE_NAME) $(DOCKER_BUILD_IMAGE_NAME) 2> /dev/null || true @rm -f $(GOPATH)/bin/$(PROGRAM_NAME) || true @rm -f $(MAKEFILE_DIRECTORY)/coverage.html || true + @rm -f $(MAKEFILE_DIRECTORY)/coverage.out || true @rm -f $(MAKEFILE_DIRECTORY)/cover.out || true @rm -fr $(TARGET_DIRECTORY) || true @rm -fr /tmp/sqlite || true diff --git a/makefiles/windows.mk b/makefiles/windows.mk index 9318f62..0c0584e 100644 --- a/makefiles/windows.mk +++ b/makefiles/windows.mk @@ -19,6 +19,7 @@ build-osarch-specific: windows/amd64 clean-osarch-specific: del /F /S /Q $(GOPATH)/bin/$(PROGRAM_NAME) del /F /S /Q $(MAKEFILE_DIRECTORY)/coverage.html + del /F /S /Q $(MAKEFILE_DIRECTORY)/coverage.out del /F /S /Q $(MAKEFILE_DIRECTORY)/cover.out del /F /S /Q $(TARGET_DIRECTORY) del /F /S /Q C:\Temp\sqlite diff --git a/package.Dockerfile b/package.Dockerfile index 666bf45..67b118a 100755 --- a/package.Dockerfile +++ b/package.Dockerfile @@ -101,7 +101,7 @@ RUN fpm \ # ----------------------------------------------------------------------------- FROM ${IMAGE_FINAL} as final -ENV REFRESHED_AT=2024-06-01 +ENV REFRESHED_AT=2024-07-01 LABEL Name="senzing/template-go" \ Maintainer="support@senzing.com" \ Version="0.0.1"