Skip to content

Commit abfcf63

Browse files
docktermjdocktermj
authored
157.dockter.1 (#159)
* #157 Update dependencies * #157 Savepoint * #157 Savepoint * #157 Improve documentation * #157 Improve documentation * #157 Improve documentation * #157 Refactor package target * #157 Refactor package target * #157 CHANGE DYLD_LIBRARY_PATH * #157 Savepoint * Savepoint * #157 Adjust variables * #157 Adjust variables * #157 Adjust variables * #157 Adjust variables * #157 Adjust variables * #157 Adjust variables * #157 Adjust variables * #157 Adjust variables * #157 CHANGE DYLD_LIBRARY_PATH * #157 CHANGE DYLD_LIBRARY_PATH * #157 CHANGE DYLD_LIBRARY_PATH * #157 CHANGE DYLD_LIBRARY_PATH * #157 CHANGE DYLD_LIBRARY_PATH * #157 Refactor to template * #157 Update dependencies * #157 Prepare for versioned release
1 parent daf9af0 commit abfcf63

28 files changed

+416
-197
lines changed

‎.github/workflows/add-dependabot-request-to-project-t-comm.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ env:
1111
GITHUB_TOKEN: ${{ secrets.SENZING_GITHUB_ACCESS_TOKEN }}
1212
CREATOR: ${{ github.event.pull_request.user.login }}
1313
jobs:
14-
assign_one_project:
14+
add-dependabot-request-to-project:
1515
name: Add dependabot pull request to Senzing Community project
1616
runs-on: ubuntu-latest
1717
steps:

‎.github/workflows/add-issue-to-project-t-comm.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
env:
1111
GITHUB_TOKEN: ${{ secrets.SENZING_GITHUB_ACCESS_TOKEN }}
1212
jobs:
13-
assign_one_project:
13+
add-issue-to-project:
1414
name: Add issue to Senzing Community project
1515
runs-on: ubuntu-latest
1616
steps:

‎.github/workflows/add-triage-label.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
- reopened
1010
- opened
1111
jobs:
12-
automate-issues-labels:
12+
add-triage-label:
1313
name: Add triage label to issue
1414
runs-on: ubuntu-latest
1515
steps:

‎.github/workflows/build-docker-container.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ on:
55
- main
66
workflow_dispatch:
77
jobs:
8-
buildDockerContainer:
9-
name: Build Docker container
8+
build-docker-container:
109
runs-on: ubuntu-latest
1110
steps:
1211
- name: Checkout repository

‎.github/workflows/dependabot-automation.yaml ‎.github/workflows/dependabot-approve-and-merge.yaml

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
---
2+
name: dependabot-approve-and-merge.yaml
23

3-
name: 'dependabot automation'
4-
5-
on:
4+
on:
65
pull_request:
76
branches: [main]
87

@@ -13,4 +12,4 @@ jobs:
1312
pull-requests: write
1413
uses: Senzing/build-resources/.github/workflows/dependabot-approve-and-merge.yaml@main
1514
secrets:
16-
SENZING_GITHUB_CODEOWNER_PR_RW_TOKEN: ${{ secrets.SENZING_GITHUB_CODEOWNER_PR_RW_TOKEN }}
15+
SENZING_GITHUB_CODEOWNER_PR_RW_TOKEN: ${{ secrets.SENZING_GITHUB_CODEOWNER_PR_RW_TOKEN }}

‎.github/workflows/go-proxy-pull.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ on:
1212
- "v[0-9]+.[0-9]+.[0-9]+"
1313

1414
jobs:
15-
build:
16-
name: Renew documentation
15+
go-proxy-pull:
1716
runs-on: ubuntu-latest
1817
steps:
1918
- name: Pull new module version

‎.github/workflows/go-test.yaml

+1-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Based on
2-
# -https://github.com/marketplace/actions/setup-go-environment
2+
# - https://github.com/marketplace/actions/setup-go-environment
33

44
name: go-test.yaml
55

@@ -40,10 +40,3 @@ jobs:
4040
- run: mkdir /tmp/sqlite
4141
- run: cp testdata/sqlite/G2C.db /tmp/sqlite/G2C.db
4242
- run: go test -v -p 1 ./...
43-
# - run: go test -v ./.
44-
# - run: go test -v ./g2configserver
45-
# - run: go test -v ./g2configmgrserver
46-
# - run: go test -v ./g2diagnosticserver
47-
# - run: go test -v ./g2engineserver
48-
# - run: go test -v ./g2productserver
49-
# - run: go test -v ./grpcserver

‎.github/workflows/go.yaml ‎.github/workflows/gofmt.yaml

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
---
2+
name: gofmt.yaml
23

3-
name: 'go'
4-
54
on:
65
pull_request:
76
branches: [main]
8-
7+
98
jobs:
109
gofmt:
11-
uses: Senzing/build-resources/.github/workflows/gofmt.yaml@main
10+
uses: Senzing/build-resources/.github/workflows/gofmt.yaml@main

‎.github/workflows/go-security.yaml ‎.github/workflows/gosec.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Based on
22
# - https://github.com/securego/gosec
33

4-
name: go-security.yaml
4+
name: gosec.yaml
55
on:
66
push:
77
branches:
@@ -10,7 +10,7 @@ on:
1010
branches:
1111
- main
1212
jobs:
13-
tests:
13+
gosec:
1414
runs-on: ubuntu-latest
1515
env:
1616
GO111MODULE: on

‎.github/workflows/identify-customer.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ env:
88
MEMBER_LIST: ${{ secrets.SENZING_MEMBERS }}
99
CREATOR: ${{ github.actor }}
1010
jobs:
11-
automate-issues-labels:
11+
identify-customer:
1212
name: Add customer-submission label
1313
runs-on: ubuntu-latest
1414
steps:

‎.github/workflows/make-go-github-file.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- "[0-9]+.[0-9]+.[0-9]+"
77

88
jobs:
9-
build:
9+
make-go-github-file:
1010
name: Update cmd/version.go
1111
runs-on: ubuntu-latest
1212
steps:

‎.github/workflows/make-go-tag.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- "[0-9]+.[0-9]+.[0-9]+"
77

88
jobs:
9-
build:
9+
make-go-tag:
1010
name: Make a vM.m.P tag
1111
runs-on: ubuntu-latest
1212
steps:

‎.github/workflows/pr-closed-automation.yaml ‎.github/workflows/move-pr-to-done.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
---
2-
3-
name: 'pr closed automation'
2+
name: move-pr-to-done.yaml
43

54
on:
65
pull_request:

‎.gitignore

+1-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,5 @@
1313

1414
# Dependency directories (remove the comment below to include it)
1515
# vendor/
16-
1716
.history
18-
target
19-
17+
target/

‎CHANGELOG.md

+9
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1010

1111
-
1212

13+
## [0.4.12] - 2023-08-03
14+
15+
### Changed in 0.4.12
16+
17+
- Update dependencies
18+
- github.com/senzing/go-cmdhelping v0.1.4
19+
- github.com/senzing/go-common v0.2.8
20+
- Refactored to template for multi-platform
21+
1322
## [0.4.11] - 2023-07-25
1423

1524
### Changed in 0.4.11

‎Dockerfile

+24-21
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,22 @@
22
# Stages
33
# -----------------------------------------------------------------------------
44

5-
# ARG IMAGE_GO_BUILDER=golang:1.20.5@sha256:6b3fa4b908676231b50acbbc00e84d8cee9c6ce072b1175c0ff352c57d8a612f - Bad
6-
ARG IMAGE_GO_BUILDER=golang:1.20.4@sha256:690e4135bf2a4571a572bfd5ddfa806b1cb9c3dea0446ebadaf32bc2ea09d4f9
5+
ARG IMAGE_SENZINGAPI_RUNTIME=senzing/senzingapi-runtime:3.6.0
6+
ARG IMAGE_GO_BUILDER=golang:1.20.4
77
ARG IMAGE_FINAL=senzing/senzingapi-runtime:3.6.0
88

9+
# -----------------------------------------------------------------------------
10+
# Stage: senzingapi_runtime
11+
# -----------------------------------------------------------------------------
12+
13+
FROM ${IMAGE_SENZINGAPI_RUNTIME} as senzingapi_runtime
14+
915
# -----------------------------------------------------------------------------
1016
# Stage: go_builder
1117
# -----------------------------------------------------------------------------
1218

1319
FROM ${IMAGE_GO_BUILDER} as go_builder
14-
ENV REFRESHED_AT=2023-07-17
20+
ENV REFRESHED_AT=2023-08-01
1521
LABEL Name="senzing/serve-grpc-builder" \
1622
Maintainer="[email protected]" \
1723
Version="0.4.9"
@@ -23,52 +29,49 @@ ARG BUILD_VERSION=0.0.0
2329
ARG BUILD_ITERATION=0
2430
ARG GO_PACKAGE_NAME="unknown"
2531

26-
# Copy remote files from DockerHub.
27-
28-
COPY --from=senzing/senzingapi-runtime:3.6.0 "/opt/senzing/g2/lib/" "/opt/senzing/g2/lib/"
29-
COPY --from=senzing/senzingapi-runtime:3.6.0 "/opt/senzing/g2/sdk/c/" "/opt/senzing/g2/sdk/c/"
30-
3132
# Copy local files from the Git repository.
3233

34+
COPY ./rootfs /
3335
COPY . ${GOPATH}/src/${GO_PACKAGE_NAME}
3436

35-
# Build go program.
37+
# Copy files from prior stage.
3638

37-
WORKDIR ${GOPATH}/src/${GO_PACKAGE_NAME}
38-
RUN make build
39+
COPY --from=senzingapi_runtime "/opt/senzing/g2/lib/" "/opt/senzing/g2/lib/"
40+
COPY --from=senzingapi_runtime "/opt/senzing/g2/sdk/c/" "/opt/senzing/g2/sdk/c/"
3941

40-
# --- Test go program ---------------------------------------------------------
42+
# Set path to Senzing libs.
43+
44+
ENV LD_LIBRARY_PATH=/opt/senzing/g2/lib/
4145

42-
# Run unit tests.
46+
# Build go program.
4347

44-
# RUN go get github.com/jstemmer/go-junit-report \
45-
# && mkdir -p /output/go-junit-report \
46-
# && go test -v ${GO_PACKAGE_NAME}/... | go-junit-report > /output/go-junit-report/test-report.xml
48+
WORKDIR ${GOPATH}/src/${GO_PACKAGE_NAME}
49+
RUN make build
4750

4851
# Copy binaries to /output.
4952

5053
RUN mkdir -p /output \
51-
&& cp -R ${GOPATH}/src/${GO_PACKAGE_NAME}/target/* /output/
54+
&& cp -R ${GOPATH}/src/${GO_PACKAGE_NAME}/target/* /output/
5255

5356
# -----------------------------------------------------------------------------
5457
# Stage: final
5558
# -----------------------------------------------------------------------------
5659

5760
FROM ${IMAGE_FINAL} as final
58-
ENV REFRESHED_AT=2023-07-17
61+
ENV REFRESHED_AT=2023-08-01
5962
LABEL Name="senzing/serve-grpc" \
6063
Maintainer="[email protected]" \
6164
Version="0.4.9"
6265

63-
# Copy files from repository.
66+
# Copy local files from the Git repository.
6467

6568
COPY ./rootfs /
6669
COPY ./testdata/senzing-license/g2.lic /etc/opt/senzing/g2.lic
6770
COPY ./testdata/sqlite/G2C.db /tmp/sqlite/G2C.db
6871

69-
# Copy files from prior step.
72+
# Copy files from prior stage.
7073

71-
COPY --from=go_builder "/output/linux/serve-grpc" "/app/serve-grpc"
74+
COPY --from=go_builder "/output/linux-amd64/serve-grpc" "/app/serve-grpc"
7275

7376
# Runtime environment variables.
7477

0 commit comments

Comments
 (0)