diff --git a/.github/workflows/build-test-push.yml b/.github/workflows/build-test-push.yml index 7791838..3d89dec 100644 --- a/.github/workflows/build-test-push.yml +++ b/.github/workflows/build-test-push.yml @@ -64,6 +64,18 @@ jobs: - name: Check out source uses: actions/checkout@v5 + - name: Configure HTTP registry + run: | + sudo mkdir -p /etc/docker + echo '{"insecure-registries":["batty1039.startdedicated.net:5000"]}' | \ + sudo tee /etc/docker/daemon.json >/dev/null + sudo systemctl restart docker + cat > /tmp/buildkitd.toml <<'EOF' + [registry."batty1039.startdedicated.net:5000"] + http = true + insecure = true + EOF + - name: Log in to private registry uses: docker/login-action@v4 with: @@ -73,6 +85,8 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v4 + with: + buildkitd-config: /tmp/buildkitd.toml - name: Build and push image uses: docker/build-push-action@v7 diff --git a/Makefile b/Makefile index 59a91e6..21b3bfd 100644 --- a/Makefile +++ b/Makefile @@ -2,8 +2,9 @@ SHELL := /bin/sh IMAGE ?= cms-demo TAG ?= latest +REGISTRY_IMAGE ?= batty1039.startdedicated.net:5000/cms-demo -.PHONY: help ui backend demo production run test check docker docker-run clean +.PHONY: help ui backend demo production run test check docker docker-push docker-run clean help: @echo "make ui build the React app into cmd/server/web/dist" @@ -14,6 +15,7 @@ help: @echo "make test run the Go test suite" @echo "make check gofmt, vet, and tests" @echo "make docker build the all-in-one image" + @echo "make docker-push build and push the image to the private registry" @echo "make docker-run run the image on :8080" @echo "make clean remove build output" @@ -51,6 +53,10 @@ check: docker: docker build -t $(IMAGE):$(TAG) . +docker-push: docker + docker tag $(IMAGE):$(TAG) $(REGISTRY_IMAGE):$(TAG) + docker push $(REGISTRY_IMAGE):$(TAG) + docker-run: docker run --rm -p 8080:8080 --env-file .env $(IMAGE):$(TAG)