Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#19 Fix build issue #25

Merged
merged 2 commits into from
Feb 8, 2024
Merged

#19 Fix build issue #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90492e2
#19 Fix build issue
docktermj Feb 8, 2024
d5b330c
#19 Fix build issue
docktermj Feb 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/docker-build-container.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
9 changes: 6 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down Expand Up @@ -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.

Expand Down
3 changes: 1 addition & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -82,6 +80,7 @@ $(PLATFORMS):
.PHONY: build
build: build-osarch-specific


.PHONY: docker-build
docker-build:
@docker build \
Expand Down