Skip to content

Commit b398476

Browse files
committed
#302 try fix permissions
1 parent 719c15b commit b398476

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

Dockerfile

+7-6
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ ARG IMAGE_FINAL=senzing/senzingapi-runtime-staging:latest
99
# Stage: senzingapi_runtime
1010
# -----------------------------------------------------------------------------
1111

12-
FROM ${IMAGE_FINAL} as senzingapi_runtime
12+
FROM ${IMAGE_FINAL} AS senzingapi_runtime
1313

1414
# -----------------------------------------------------------------------------
1515
# Stage: builder
1616
# -----------------------------------------------------------------------------
1717

18-
FROM ${IMAGE_BUILDER} as builder
18+
FROM ${IMAGE_BUILDER} AS builder
1919
ENV REFRESHED_AT=2024-07-01
20-
LABEL Name="senzing/go-builder" \
20+
LABEL Name="senzing/builder" \
2121
Maintainer="[email protected]" \
2222
Version="0.1.0"
2323

@@ -53,11 +53,11 @@ RUN mkdir -p /output \
5353
# Stage: final
5454
# -----------------------------------------------------------------------------
5555

56-
FROM ${IMAGE_FINAL} as final
56+
FROM ${IMAGE_FINAL} AS final
5757
ENV REFRESHED_AT=2024-07-01
5858
LABEL Name="senzing/serve-grpc" \
5959
Maintainer="[email protected]" \
60-
Version="0.6.0"
60+
Version="0.7.6"
6161
HEALTHCHECK --interval=30s --timeout=30s --start-period=5s --retries=3 CMD [ "/app/healthcheck.sh" ]
6262
USER root
6363

@@ -68,11 +68,12 @@ COPY ./rootfs /
6868
# Copy files from prior stage.
6969

7070
COPY --from=builder "/output/linux/serve-grpc" "/app/serve-grpc"
71+
COPY ./testdata/sqlite/G2C.db /tmp/sqlite/G2C.db
72+
RUN chmod --recursive 777 /tmp/sqlite
7173

7274
# Run as non-root container
7375

7476
USER 1001
75-
COPY ./testdata/sqlite/G2C.db /tmp/sqlite/G2C.db
7677

7778
# Runtime environment variables.
7879

Makefile

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ GO_ARCH = $(word 2, $(GO_OSARCH))
3838
# Can be overridden with "export"
3939
# Example: "export LD_LIBRARY_PATH=/path/to/my/senzing/g2/lib"
4040

41+
DOCKER_BUILDKIT ?= DOCKER_BUILDKIT=0
4142
DOCKER_IMAGE_TAG ?= $(GIT_REPOSITORY_NAME):$(GIT_VERSION)
4243
GOBIN ?= $(shell go env GOPATH)/bin
4344
LD_LIBRARY_PATH ?= /opt/senzing/g2/lib

makefiles/linux.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ documentation-osarch-specific:
4646

4747
.PHONY: docker-build-osarch-specific
4848
docker-build-osarch-specific:
49-
@docker build \
49+
@$(DOCKER_BUILDKIT) docker build \
5050
--tag $(DOCKER_IMAGE_NAME) \
5151
--tag $(DOCKER_IMAGE_NAME):$(BUILD_VERSION) \
5252
.

0 commit comments

Comments
 (0)