chore: update more registries

This PR updates some places in the Makefile and Dockerfile that I missed that surfaced after hitting the build-and-publish step with drone. Signed-off-by: Spencer Smith <spencer.smith@talos-systems.com>
siderolabs · May 18, 2022 · 3e9379e · 3e9379e
1 parent 294fd62
commit 3e9379e
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 45 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -7,25 +7,25 @@ ARG PKGS
 
 # Resolve package images using ${PKGS} to be used later in COPY --from=.
 
-FROM ghcr.io/talos-systems/ca-certificates:${PKGS} AS pkg-ca-certificates
-FROM ghcr.io/talos-systems/fhs:${PKGS} AS pkg-fhs
-FROM ghcr.io/talos-systems/ipmitool:${PKGS} AS pkg-ipmitool
-FROM --platform=amd64 ghcr.io/talos-systems/ipmitool:${PKGS} AS pkg-ipmitool-amd64
-FROM --platform=arm64 ghcr.io/talos-systems/ipmitool:${PKGS} AS pkg-ipmitool-arm64
-FROM ghcr.io/talos-systems/libressl:${PKGS} AS pkg-libressl
-FROM --platform=amd64 ghcr.io/talos-systems/libressl:${PKGS} AS pkg-libressl-amd64
-FROM --platform=arm64 ghcr.io/talos-systems/libressl:${PKGS} AS pkg-libressl-arm64
-FROM --platform=amd64 ghcr.io/talos-systems/linux-firmware:${PKGS} AS pkg-linux-firmware-amd64
-FROM --platform=arm64 ghcr.io/talos-systems/linux-firmware:${PKGS} AS pkg-linux-firmware-arm64
-FROM ghcr.io/talos-systems/musl:${PKGS} AS pkg-musl
-FROM --platform=amd64 ghcr.io/talos-systems/musl:${PKGS} AS pkg-musl-amd64
-FROM --platform=arm64 ghcr.io/talos-systems/musl:${PKGS} AS pkg-musl-arm64
-FROM --platform=amd64 ghcr.io/talos-systems/kernel:${PKGS} AS pkg-kernel-amd64
-FROM --platform=arm64 ghcr.io/talos-systems/kernel:${PKGS} AS pkg-kernel-arm64
-FROM ghcr.io/talos-systems/liblzma:${PKGS} AS pkg-liblzma
-FROM ghcr.io/talos-systems/ipxe:${PKGS} AS pkg-ipxe
-FROM --platform=amd64 ghcr.io/talos-systems/ipxe:${PKGS} AS pkg-ipxe-amd64
-FROM --platform=arm64 ghcr.io/talos-systems/ipxe:${PKGS} AS pkg-ipxe-arm64
+FROM ghcr.io/siderolabs/ca-certificates:${PKGS} AS pkg-ca-certificates
+FROM ghcr.io/siderolabs/fhs:${PKGS} AS pkg-fhs
+FROM ghcr.io/siderolabs/ipmitool:${PKGS} AS pkg-ipmitool
+FROM --platform=amd64 ghcr.io/siderolabs/ipmitool:${PKGS} AS pkg-ipmitool-amd64
+FROM --platform=arm64 ghcr.io/siderolabs/ipmitool:${PKGS} AS pkg-ipmitool-arm64
+FROM ghcr.io/siderolabs/openssl:${PKGS} AS pkg-openssl
+FROM --platform=amd64 ghcr.io/siderolabs/openssl:${PKGS} AS pkg-openssl-amd64
+FROM --platform=arm64 ghcr.io/siderolabs/openssl:${PKGS} AS pkg-openssl-arm64
+FROM --platform=amd64 ghcr.io/siderolabs/linux-firmware:${PKGS} AS pkg-linux-firmware-amd64
+FROM --platform=arm64 ghcr.io/siderolabs/linux-firmware:${PKGS} AS pkg-linux-firmware-arm64
+FROM ghcr.io/siderolabs/musl:${PKGS} AS pkg-musl
+FROM --platform=amd64 ghcr.io/siderolabs/musl:${PKGS} AS pkg-musl-amd64
+FROM --platform=arm64 ghcr.io/siderolabs/musl:${PKGS} AS pkg-musl-arm64
+FROM --platform=amd64 ghcr.io/siderolabs/kernel:${PKGS} AS pkg-kernel-amd64
+FROM --platform=arm64 ghcr.io/siderolabs/kernel:${PKGS} AS pkg-kernel-arm64
+FROM ghcr.io/siderolabs/liblzma:${PKGS} AS pkg-liblzma
+FROM ghcr.io/siderolabs/ipxe:${PKGS} AS pkg-ipxe
+FROM --platform=amd64 ghcr.io/siderolabs/ipxe:${PKGS} AS pkg-ipxe-amd64
+FROM --platform=arm64 ghcr.io/siderolabs/ipxe:${PKGS} AS pkg-ipxe-arm64
 
 # The base target provides the base for running various tasks against the source
 # code
@@ -117,15 +117,15 @@ ARG GO_LDFLAGS
 RUN --mount=type=cache,target=/.cache GOOS=linux GOARCH=${TARGETARCH} go build ${GO_BUILDFLAGS} -ldflags "${GO_LDFLAGS}" -o /manager ./app/caps-controller-manager
 RUN chmod +x /manager
 
-## TODO(rsmitty): make bmc pkg and move to talos-systems image
+## TODO(rsmitty): make bmc pkg and move to siderolabs image
 FROM scratch AS caps-controller-manager
 COPY --from=pkg-ca-certificates / /
 COPY --from=pkg-fhs / /
 COPY --from=pkg-musl / /
-COPY --from=pkg-libressl / /
+COPY --from=pkg-openssl / /
 COPY --from=pkg-ipmitool / /
 COPY --from=build-caps-controller-manager /manager /manager
-LABEL org.opencontainers.image.source https://github.com/talos-systems/sidero
+LABEL org.opencontainers.image.source https://github.com/siderolabs/sidero
 ENTRYPOINT [ "/manager" ]
 
 FROM base AS build-sidero-controller-manager
@@ -176,7 +176,7 @@ FROM base AS initramfs-archive-amd64
 WORKDIR /initramfs
 COPY --from=pkg-ca-certificates / .
 COPY --from=pkg-musl-amd64 / .
-COPY --from=pkg-libressl-amd64 / .
+COPY --from=pkg-openssl-amd64 / .
 COPY --from=pkg-ipmitool-amd64 / .
 COPY --from=agent-build-amd64 /agent ./init
 COPY --from=pkg-linux-firmware-amd64 /lib/firmware/bnx2 ./lib/firmware/bnx2
@@ -187,7 +187,7 @@ FROM base AS initramfs-archive-arm64
 WORKDIR /initramfs
 COPY --from=pkg-ca-certificates / .
 COPY --from=pkg-musl-arm64 / .
-COPY --from=pkg-libressl-arm64 / .
+COPY --from=pkg-openssl-arm64 / .
 COPY --from=pkg-ipmitool-arm64 / .
 COPY --from=agent-build-arm64 /agent ./init
 COPY --from=pkg-linux-firmware-arm64 /lib/firmware/bnx2 ./lib/firmware/bnx2
@@ -198,7 +198,7 @@ FROM scratch AS sidero-controller-manager-image
 COPY --from=pkg-ca-certificates / /
 COPY --from=pkg-fhs / /
 COPY --from=pkg-musl / /
-COPY --from=pkg-libressl / /
+COPY --from=pkg-openssl / /
 COPY --from=pkg-liblzma / /
 COPY --from=pkg-ipmitool / /
 COPY --from=pkg-ipxe-amd64 /usr/libexec/ /var/lib/sidero/ipxe/amd64
@@ -214,7 +214,7 @@ COPY --from=build-log-receiver /log-receiver /log-receiver
 COPY --from=build-events-manager /events-manager /events-manager
 
 FROM sidero-controller-manager-image AS sidero-controller-manager
-LABEL org.opencontainers.image.source https://github.com/talos-systems/sidero
+LABEL org.opencontainers.image.source https://github.com/siderolabs/sidero
 ENTRYPOINT [ "/manager" ]
 
 FROM base AS unit-tests-runner
@@ -262,21 +262,21 @@ RUN npm i -g textlint-rule-one-sentence-per-line@1.0.2
 WORKDIR /src
 COPY . .
 RUN markdownlint \
-    --ignore '**/LICENCE.md' \
-    --ignore '**/CHANGELOG.md' \
-    --ignore '**/CODE_OF_CONDUCT.md' \
-    --ignore '**/node_modules/**' \
-    --ignore '**/hack/chglog/**' \
-    .
+  --ignore '**/LICENCE.md' \
+  --ignore '**/CHANGELOG.md' \
+  --ignore '**/CODE_OF_CONDUCT.md' \
+  --ignore '**/node_modules/**' \
+  --ignore '**/hack/chglog/**' \
+  .
 RUN find . \
-    -name '*.md' \
-    -not -path './LICENCE.md' \
-    -not -path './CHANGELOG.md' \
-    -not -path './CODE_OF_CONDUCT.md' \
-    -not -path '*/node_modules/*' \
-    -not -path './hack/chglog/**' \
-    -print0 \
-    | xargs -0 textlint
+  -name '*.md' \
+  -not -path './LICENCE.md' \
+  -not -path './CHANGELOG.md' \
+  -not -path './CODE_OF_CONDUCT.md' \
+  -not -path '*/node_modules/*' \
+  -not -path './hack/chglog/**' \
+  -print0 \
+  | xargs -0 textlint
 
 #
 # The sfyra-build target builds the Sfyra source.

diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 REGISTRY ?= ghcr.io
-USERNAME ?= talos-systems
+USERNAME ?= siderolabs
 SHA ?= $(shell git describe --match=none --always --abbrev=8 --dirty)
 TAG ?= $(shell git describe --tag --always --dirty)
 BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD)
@@ -13,8 +13,8 @@ TALOS_RELEASE ?= v0.14.1
 PREVIOUS_TALOS_RELEASE ?= v0.13.4
 DEFAULT_K8S_VERSION ?= v1.22.3
 
-TOOLS ?= ghcr.io/talos-systems/tools:v0.10.0-alpha.0-3-g4c9e7a4
-PKGS ?= v0.10.0-alpha.0-24-g6019223
+TOOLS ?= ghcr.io/siderolabs/tools:v1.0.0-1-g4c77d96
+PKGS ?= v1.0.0-6-g7c293d5
 
 SFYRA_CLUSTERCTL_CONFIG ?= $(HOME)/.cluster-api/clusterctl.sfyra.yaml
 
@@ -148,7 +148,7 @@ release-notes:
 
 $(ARTIFACTS)/$(TALOS_RELEASE)/%:
 	@mkdir -p $(ARTIFACTS)/$(TALOS_RELEASE)/
-	@curl -L -o "$(ARTIFACTS)/$(TALOS_RELEASE)/$*" "https://github.com/talos-systems/talos/releases/download/$(TALOS_RELEASE)/$*"
+	@curl -L -o "$(ARTIFACTS)/$(TALOS_RELEASE)/$*" "https://github.com/siderolabs/talos/releases/download/$(TALOS_RELEASE)/$*"
 
 .PHONY: $(ARTIFACTS)/$(TALOS_RELEASE)
 $(ARTIFACTS)/$(TALOS_RELEASE): $(ARTIFACTS)/$(TALOS_RELEASE)/vmlinuz-amd64 $(ARTIFACTS)/$(TALOS_RELEASE)/initramfs-amd64.xz $(ARTIFACTS)/$(TALOS_RELEASE)/talosctl-linux-amd64
@@ -224,7 +224,7 @@ unit-tests-race: ## Performs unit tests with race detection enabled.
 
 .PHONY: conformance
 conformance: ## Performs policy checks against the commit and source code.
-	docker run --rm -it -v $(PWD):/src -w /src ghcr.io/talos-systems/conform:v0.1.0-alpha.22 enforce
+	docker run --rm -it -v $(PWD):/src -w /src ghcr.io/siderolabs/conform:v0.1.0-alpha.25-2-g625a1c5 enforce
 
 .PHONY: clean
 clean: