Skip to content

Commit

Permalink
Fix docker build in gitlab (open-telemetry#856)
Browse files Browse the repository at this point in the history
  • Loading branch information
jeffreyc-splunk authored Oct 19, 2021
1 parent 6548fed commit f698ffd
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 2 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,12 @@ compile:
after_script:
- if [ -e bin/otelcol ]; then rm -f bin/otelcol; fi # remove the symlink
- if [ -e bin/translatesfx ]; then rm -f bin/translatesfx; fi # remove the symlink
- if [ -e bin/migratecheckpoint ]; then rm -f bin/migratecheckpoint; fi # remove the symlink
artifacts:
paths:
- bin/otelcol_*
- bin/translatesfx_*
- bin/migratecheckpoint_*

.sign-release-cache:
image: 'docker.repo.splunkdev.net/ci-cd/ci-container:python-3.9'
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -227,13 +227,13 @@ binaries-darwin_amd64:
binaries-linux_amd64:
GOOS=linux GOARCH=amd64 $(MAKE) otelcol
GOOS=linux GOARCH=amd64 $(MAKE) translatesfx
GOOS=linux GOARCH=amd64 $(MAKE) migratecheckpoint
GOOS=linux GOARCH=amd64 $(MAKE) migratecheckpoint

.PHONY: binaries-linux_arm64
binaries-linux_arm64:
GOOS=linux GOARCH=arm64 $(MAKE) otelcol
GOOS=linux GOARCH=arm64 $(MAKE) translatesfx
GOOS=linux GOARCH=amd64 $(MAKE) migratecheckpoint
GOOS=linux GOARCH=arm64 $(MAKE) migratecheckpoint

.PHONY: binaries-windows_amd64
binaries-windows_amd64:
Expand Down

0 comments on commit f698ffd

Please sign in to comment.