Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
jcollins-axway committed Nov 9, 2023
1 parent 6c5da3f commit 996a557
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ time := $(shell date +%Y%m%d%H%M%S)
version := $(shell git tag -l --sort='version:refname' | grep -Eo '[0-9]{1,}\.[0-9]{1,}\.[0-9]{1,3}$$' | tail -1)
CGO_ENABLED := 0
commit_id := $(shell git rev-parse --short HEAD)
sdk_version := $(shell go list -m github.com/Axway/agent-sdk | awk '{print $$2}' | awk -F'-' '{print substr($$1, 2)}'`)
sdk_version := $(shell go list -m github.com/Axway/agent-sdk | awk '{print $$2}' | awk -F'-' '{print substr($$1, 2)}')

export GOFLAGS := -mod=mod
export GOPRIVATE=git.ecd.axway.org/apigov
Expand Down Expand Up @@ -66,11 +66,11 @@ build: build-da build-ta

docker-da:
docker build --build-arg commit_id=$(commit_id) --build-arg time=$(time) --build-arg CGO_ENABLED=$(CGO_ENABLED) --build-arg version=$(version) --build-arg sdk_version=$(sdk_version) --build-arg commit_id=$(commit_id) -t kong-discovery-agent:latest -f ${WORKSPACE}/build/discovery/Dockerfile .
echo "DA Docker build complete"
@echo "DA Docker build complete"

docker-ta:
docker build --build-arg commit_id=$(commit_id) --build-arg time=$(time) --build-arg CGO_ENABLED=$(CGO_ENABLED) --build-arg version=$(version) --build-arg sdk_version=$(sdk_version) --build-arg commit_id=$(commit_id) -t kong-traceability-agent:latest -f ${WORKSPACE}/build/traceability/Dockerfile .
echo "TA Docker build complete"
@echo "TA Docker build complete"

docker: docker-da docker-ta
@echo "Docker build complete"
4 changes: 1 addition & 3 deletions build/traceability/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
-X 'github.com/Axway/agent-sdk/pkg/cmd.BuildAgentDescription=Kong Traceability Agent'" \
-a -o /traceability_agent ${BASEPATH}/pkg/main/traceability/main.go

RUN cp ${BASEPATH}/build/traceability/kong_traceability_agent.yml /kong_traceability_agent.yml

# Create non-root user
RUN addgroup -g 2500 axway && adduser -u 2500 -D -G axway axway
RUN chown -R axway:axway /traceability_agent
Expand All @@ -48,7 +46,7 @@ FROM docker.io/alpine@sha256:c5c5fda71656f28e49ac9c5416b3643eaa6a108a8093151d6d1
COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
COPY --from=builder /etc/passwd /etc/passwd
COPY --from=builder /traceability_agent /kong_traceability_agent
COPY --from=builder /kong_traceability_agent.yml /kong_traceability_agent.yml
COPY build/traceability/kong_traceability_agent.yml /kong_traceability_agent.yml

RUN mkdir /keys && \
chown -R axway /keys && \
Expand Down

0 comments on commit 996a557

Please sign in to comment.