Infrastructure/zot
0
Fork 0
mirror of https://github.com/project-zot/zot.git synced 2024-12-30 22:34:13 -05:00
Code Issues Activity

fix: binary-stacker Makefile target is broken (#1689)

Browse source 
Signed-off-by: Alexei Dodon <adodon@cisco.com>
This commit is contained in:
Alexei Dodon 2023-08-10 22:39:56 +03:00 committed by GitHub
parent 04627534a9
commit 59922af528
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Makefile
View file

@ -321,13 +321,14 @@ run-container:
zot-build:latest zot-build:latest
.PHONY: binary-stacker .PHONY: binary-stacker
binary-stacker: binary-stacker: $(STACKER)
${STACKER} --debug build \ ${STACKER} --debug build \
-f build/stacker.yaml \ -f build/stacker.yaml \
--substitute PWD=$$PWD \ --substitute COMMIT=$(COMMIT) \
--substitute COMMIT=$$COMMIT \ --substitute ARCH=$(ARCH) \
--substitute ARCH=$$ARCH \ --substitute OS=$(OS) \
--substitute OS=$$OS --substitute RELEASE_TAG=$(RELEASE_TAG) \
--substitute REPO_NAME=zot-$(OS)-$(ARCH)
.PHONY: image .PHONY: image
image: image:

6
build/stacker.yaml
View file

@ -13,7 +13,7 @@ build:
cd /go/src/github.com/project-zot cd /go/src/github.com/project-zot
git clone /zotcopy zot git clone /zotcopy zot
cd /go/src/github.com/project-zot/zot cd /go/src/github.com/project-zot/zot
make COMMIT=${{COMMIT}} OS=${{OS}} ARCH=${{ARCH}} RELEASE_TAG=${{RELEASE_TAG}} clean binary${{EXT:}} make COMMIT=${{COMMIT}} OS=${{OS}} ARCH=${{ARCH}} RELEASE_TAG=${{RELEASE_TAG}} clean binary
cat > config.json << EOF cat > config.json << EOF
{ {
"storage":{ "storage":{
@ -49,7 +49,7 @@ build:
mkdir -p binary/ cert/ config/ mkdir -p binary/ cert/ config/
cp /go/src/github.com/project-zot/zot/bin/zot-${{OS}}-${{ARCH}}${{EXT:}} binary/ cp /go/src/github.com/project-zot/zot/bin/zot-${{OS}}-${{ARCH}} binary/
cp /go/src/github.com/project-zot/zot/config.json config/ cp /go/src/github.com/project-zot/zot/config.json config/
cp /etc/ssl/certs/ca-certificates.crt cert/ cp /etc/ssl/certs/ca-certificates.crt cert/
build_only: true build_only: true
@ -68,7 +68,7 @@ build:
- source: ../.build/${{REPO_NAME}}/config - source: ../.build/${{REPO_NAME}}/config
dest: /etc/zot dest: /etc/zot
entrypoint: entrypoint:
- /usr/local/bin/zot-${{OS}}-${{ARCH}}${{EXT:}} - /usr/local/bin/zot-${{OS}}-${{ARCH}}
volumes: volumes:
- /var/lib/registry - /var/lib/registry
cmd: cmd: