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

Default to unreleased docker tag #8760

Merged
merged 2 commits into from
Jan 17, 2024
Merged

Default to unreleased docker tag #8760

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
e5302c6
chore(deployment): remove unused docker-push make targets
mhofman Jan 17, 2024
3ac1103
chore: default deployment docker tag to unreleased
mhofman Jan 17, 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
2 changes: 1 addition & 1 deletion .github/workflows/integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ jobs:
df -h
- uses: actions/checkout@v3
- name: docker build (sdk)
# Produces ghcr.io/agoric/agoric-sdk:latest used in the following upgrade test.
# Produces ghcr.io/agoric/agoric-sdk:unreleased used in the following upgrade test.
# run: cd packages/deployment && ./scripts/test-docker-build.sh | $TEST_COLLECT
# XXX skip TAP test output and collection for now; it hides the output from the logs
run: make docker-build-sdk
Expand Down
2 changes: 1 addition & 1 deletion a3p-integration/proposals/a:upgrade-next/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"agoricProposal": {
"releaseNotes": "TBD",
"sdkImageTag": "latest",
"sdkImageTag": "unreleased",
"planName": "UNRELEASED_UPGRADE",
"upgradeInfo": {
"coreProposals": [
Expand Down
36 changes: 1 addition & 35 deletions packages/deployment/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,12 @@
REPOSITORY = ghcr.io/agoric/cosmic-swingset
REPOSITORY_SDK = ghcr.io/agoric/agoric-sdk
SS := ../cosmic-swingset/
VERSION := $(shell node -e 'console.log(require("../../package.json").version??"")' 2>/dev/null)

TAG := $(if $(VERSION),$(VERSION),latest)
TAG := unreleased
GIT_REVISION := $(shell hash=$$(git rev-parse --short HEAD); \
dirty=`git diff --quiet 2>/dev/null || echo -dirty`; \
echo "$$hash$$dirty")

# Don't push alpha tags as ":$(TAG)".
ifeq ($(TAG),latest)
DONT_PUSH_LATEST := :
else
DONT_PUSH_LATEST := $(if $(findstring -,$(TAG)),:,)
endif

default: docker-build

docker-show-fat:
Expand Down Expand Up @@ -42,32 +34,6 @@ docker-build-ssh-node:
docker build --build-arg=TAG=$(TAG) -t ghcr.io/agoric/ssh-node:$(TAG) --file=Dockerfile.ssh-node ./docker
docker tag ghcr.io/agoric/ssh-node:$(TAG) ghcr.io/agoric/ssh-node:latest

# Just push $(TAG)
docker-push-only:
$(MAKE) docker-push DONT_PUSH_LATEST=: TAG=$(TAG)

docker-push: docker-push-base docker-push-solo docker-push-setup \
docker-push-ibc-alpha docker-push-ssh-node

# ./docker is an emptyish directory.
docker-build-ibc-alpha:
docker build --build-arg=SDK_TAG=$(TAG) -t $(REPOSITORY_SDK):ibc-alpha --file=Dockerfile.ibc-alpha ./docker

docker-push-ibc-alpha: docker-build-ibc-alpha
docker push $(REPOSITORY_SDK):ibc-alpha

docker-push-setup:
$(DONT_PUSH_LATEST) docker push $(REPOSITORY)-setup:latest
docker push $(REPOSITORY)-setup:$(TAG)

docker-push-base:
$(DONT_PUSH_LATEST) docker push $(REPOSITORY_SDK):latest
docker push $(REPOSITORY_SDK):$(TAG)

docker-push-solo:
$(DONT_PUSH_LATEST) docker push $(REPOSITORY)-solo:latest
docker push $(REPOSITORY)-solo:$(TAG)

docker-push-ssh-node:
$(DONT_PUSH_LATEST) docker push ghcr.io/agoric/ssh-node:latest
docker push ghcr.io/agoric/ssh-node:$(TAG)
Loading