From 00f8afd7434d7f864c169417af789f25a1ee8135 Mon Sep 17 00:00:00 2001 From: Raj Chaudhuri Date: Thu, 29 Feb 2024 15:14:44 +0530 Subject: [PATCH] Changed registry user in publishables to rajchaudhuri on docker hub Also made some aesthetic changes to scripts and build files --- prog/weave-kube/weave-daemonset-k8s-1.11.yaml | 6 +-- prog/weave-kube/weave-daemonset-k8s-1.8.yaml | 6 +-- prog/weave-kube/weave-daemonset-k8s-1.9.yaml | 6 +-- reweave/BUILDING.md | 6 +-- reweave/CHANGELOG.md | 2 +- reweave/Makefile | 2 +- reweave/build/Dockerfile | 48 +++++++++---------- reweave/tools/build-images.sh | 2 +- 8 files changed, 39 insertions(+), 39 deletions(-) diff --git a/prog/weave-kube/weave-daemonset-k8s-1.11.yaml b/prog/weave-kube/weave-daemonset-k8s-1.11.yaml index 04b0e435..69619b3b 100644 --- a/prog/weave-kube/weave-daemonset-k8s-1.11.yaml +++ b/prog/weave-kube/weave-daemonset-k8s-1.11.yaml @@ -120,7 +120,7 @@ items: spec: initContainers: - name: weave-init - image: 'weaveworks/weave-kube:latest' + image: 'rajchaudhuri/weave-kube:latest' imagePullPolicy: Always command: - /home/weave/init.sh @@ -151,7 +151,7 @@ items: fieldRef: apiVersion: v1 fieldPath: spec.nodeName - image: 'weaveworks/weave-kube:latest' + image: 'rajchaudhuri/weave-kube:latest' imagePullPolicy: Always readinessProbe: httpGet: @@ -182,7 +182,7 @@ items: fieldRef: apiVersion: v1 fieldPath: spec.nodeName - image: 'weaveworks/weave-npc:latest' + image: 'rajchaudhuri/weave-npc:latest' imagePullPolicy: Always #npc-args resources: diff --git a/prog/weave-kube/weave-daemonset-k8s-1.8.yaml b/prog/weave-kube/weave-daemonset-k8s-1.8.yaml index 383aa1d8..85266f8b 100644 --- a/prog/weave-kube/weave-daemonset-k8s-1.8.yaml +++ b/prog/weave-kube/weave-daemonset-k8s-1.8.yaml @@ -117,7 +117,7 @@ items: spec: initContainers: - name: weave-init - image: 'weaveworks/weave-kube:latest' + image: 'rajchaudhuri/weave-kube:latest' imagePullPolicy: Always command: - /home/weave/init.sh @@ -148,7 +148,7 @@ items: fieldRef: apiVersion: v1 fieldPath: spec.nodeName - image: 'weaveworks/weave-kube:latest' + image: 'rajchaudhuri/weave-kube:latest' imagePullPolicy: Always readinessProbe: httpGet: @@ -179,7 +179,7 @@ items: fieldRef: apiVersion: v1 fieldPath: spec.nodeName - image: 'weaveworks/weave-npc:latest' + image: 'rajchaudhuri/weave-npc:latest' imagePullPolicy: Always #npc-args resources: diff --git a/prog/weave-kube/weave-daemonset-k8s-1.9.yaml b/prog/weave-kube/weave-daemonset-k8s-1.9.yaml index a66656fe..777b9f79 100644 --- a/prog/weave-kube/weave-daemonset-k8s-1.9.yaml +++ b/prog/weave-kube/weave-daemonset-k8s-1.9.yaml @@ -120,7 +120,7 @@ items: spec: initContainers: - name: weave-init - image: 'weaveworks/weave-kube:latest' + image: 'rajchaudhuri/weave-kube:latest' imagePullPolicy: Always command: - /home/weave/init.sh @@ -151,7 +151,7 @@ items: fieldRef: apiVersion: v1 fieldPath: spec.nodeName - image: 'weaveworks/weave-kube:latest' + image: 'rajchaudhuri/weave-kube:latest' imagePullPolicy: Always readinessProbe: httpGet: @@ -182,7 +182,7 @@ items: fieldRef: apiVersion: v1 fieldPath: spec.nodeName - image: 'weaveworks/weave-npc:latest' + image: 'rajchaudhuri/weave-npc:latest' imagePullPolicy: Always #npc-args resources: diff --git a/reweave/BUILDING.md b/reweave/BUILDING.md index 8ee5efc0..f56ba20a 100644 --- a/reweave/BUILDING.md +++ b/reweave/BUILDING.md @@ -75,11 +75,11 @@ It starts from `builderbase` as the base, and does the following: * Sets environment variables indicating the current build and target architectures * Copies in the source code * Downloads modules -* Uses a [Makefile](build/Makefilemakefile) to build all weave net executables for the target architecture +* Uses a [Makefile](build/Makefile) to build all weave net executables for the target architecture #### Stage 3 (alpinebase) -All weave net images ultimately derive from an Alpine base image. This stage allows customization of an official Alpine image, and using the customized image as the base for the weave net images. Currently, there is no customization required. +All weave net images ultimately derive from an Alpine base image. This stage allows customization of an official Alpine image, and using the customized image as the base for the weave net images. #### Subsequent stages @@ -87,7 +87,7 @@ Each of the subsequent stages builds one image, corresponding to one component o ### Makefile -The [Makefile](build/Makefile) is a distilled version of the [old Makefile](../Makefile). It only builds executables. It invokes the correct C cross-compiler, and picks up the correct static `libpcap`, based on the target architecture. **It is meant be used only in Stage 2 of the build process, and not directly.** +The [Makefile](build/Makefile) is a distilled version of the [old Makefile](../Makefile). It only builds executables. It invokes the correct C cross-compiler, and picks up the correct static `libpcap`, based on the target architecture. **It is meant be used only in Stage 2 of the build process, and not directly on a development environment.** ## Build Tools diff --git a/reweave/CHANGELOG.md b/reweave/CHANGELOG.md index 26cba7ca..051928e4 100644 --- a/reweave/CHANGELOG.md +++ b/reweave/CHANGELOG.md @@ -2,7 +2,7 @@ All changes made to the weave net codebase during the reweave effort will be documented in this file. -## latest +## 2.8.2-beta11 (0d58e179) latest ### Changed diff --git a/reweave/Makefile b/reweave/Makefile index 5489416c..2c914094 100644 --- a/reweave/Makefile +++ b/reweave/Makefile @@ -1,5 +1,5 @@ IMAGE_VERSION ?= 2.8.2-beta11 -REGISTRY_USER ?= weaveworks +REGISTRY_USER ?= rajchaudhuri ALPINE_BASEIMAGE ?= alpine:3.18.4 diff --git a/reweave/build/Dockerfile b/reweave/build/Dockerfile index 101ba16a..223e6c59 100644 --- a/reweave/build/Dockerfile +++ b/reweave/build/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -ARG ALPINE_BASEIMAGE=alpine:3.17.2 +ARG ALPINE_BASEIMAGE=alpine:3.18.4 ######## # Stage 1: go 1.20 on debian bullseye @@ -92,18 +92,18 @@ RUN apk update \ FROM alpinebase AS weaverimage LABEL works.weave.role="system" \ - maintainer="Weaveworks " \ + maintainer="Raj Chaudhuri " \ org.opencontainers.image.title="Weave Net" \ org.opencontainers.image.description="Weave Net creates a virtual network that connects Docker containers across multiple hosts and enables their automatic discovery" \ - org.opencontainers.image.url="https://weave.works" \ - org.opencontainers.image.source="https://github.com/weaveworks/weave" \ - org.opencontainers.image.vendor="Weaveworks" \ + org.opencontainers.image.url="https://github.com/rajch/weave" \ + org.opencontainers.image.source="https://github.com/rajch/weave" \ + org.opencontainers.image.vendor="Raj Chaudhuri (forked from Weaveworks)" \ org.label-schema.schema-version="1.0" \ org.label-schema.name="Weave Net" \ org.label-schema.description="Weave Net creates a virtual network that connects Docker containers across multiple hosts and enables their automatic discovery" \ - org.label-schema.url="https://weave.works" \ - org.label-schema.vcs-url="https://github.com/weaveworks/weave" \ - org.label-schema.vendor="Weaveworks" + org.label-schema.url="https://github.com/rajch/weave" \ + org.label-schema.vcs-url="https://github.com/rajch/weave" \ + org.label-schema.vendor="Raj Chaudhuri (forked from Weaveworks)" RUN apk add --update \ curl \ @@ -134,10 +134,10 @@ LABEL org.opencontainers.image.revision="${revision}" \ # This will be tagged as REGISTRY_USER/weaveexec:VERSION FROM weaverimage AS weavexecimage -LABEL maintainer="Weaveworks " \ +LABEL maintainer="Raj Chaudhuri " \ org.opencontainers.image.title="weaveexec" \ - org.opencontainers.image.source="https://github.com/weaveworks/weave" \ - org.opencontainers.image.vendor="Weaveworks" + org.opencontainers.image.source="https://github.com/rajch/weave" \ + org.opencontainers.image.vendor="Raj Chaudhuri (forked from Weaveworks)" ENTRYPOINT ["/home/weave/sigproxy", "/home/weave/weave"] @@ -159,10 +159,10 @@ LABEL org.opencontainers.image.revision="${revision}" \ # This will be tagged as REGISTRY_USER/weave-kube:VERSION FROM weaverimage AS weavekubeimage -LABEL maintainer="Weaveworks " \ +LABEL maintainer="Raj Chaudhuri " \ org.opencontainers.image.title="weave-kube" \ - org.opencontainers.image.source="https://github.com/weaveworks/weave" \ - org.opencontainers.image.vendor="Weaveworks" + org.opencontainers.image.source="https://github.com/rajch/weave" \ + org.opencontainers.image.vendor="Raj Chaudhuri (forked from Weaveworks)" COPY --from=builder /root/weave/prog/weave-kube/init.sh /root/weave/prog/weave-kube/launch.sh /root/weave/prog/kube-utils/kube-utils /home/weave/ ENTRYPOINT ["/home/weave/launch.sh"] @@ -180,18 +180,18 @@ LABEL org.opencontainers.image.revision="${revision}" \ FROM alpinebase AS weavenpcimage LABEL works.weave.role="system" \ - maintainer="Weaveworks " \ + maintainer="Raj Chaudhuri " \ org.opencontainers.image.title="Weave Net" \ org.opencontainers.image.description="Weave Net creates a virtual network that connects Docker containers across multiple hosts and enables their automatic discovery" \ - org.opencontainers.image.url="https://weave.works" \ - org.opencontainers.image.source="https://github.com/weaveworks/weave" \ - org.opencontainers.image.vendor="Weaveworks" \ + org.opencontainers.image.url="https://github.com/rajch/weave" \ + org.opencontainers.image.source="https://github.com/rajch/weave" \ + org.opencontainers.image.vendor="Raj Chaudhuri (forked from Weaveworks)" \ org.label-schema.schema-version="1.0" \ org.label-schema.name="Weave Net" \ org.label-schema.description="Weave Net creates a virtual network that connects Docker containers across multiple hosts and enables their automatic discovery" \ - org.label-schema.url="https://weave.works" \ - org.label-schema.vcs-url="https://github.com/weaveworks/weave" \ - org.label-schema.vendor="Weaveworks" + org.label-schema.url="https://github.com/rajch/weave" \ + org.label-schema.vcs-url="https://github.com/rajch/weave" \ + org.label-schema.vendor="Raj Chaudhuri (forked from Weaveworks)" RUN apk add --update \ iptables \ @@ -220,10 +220,10 @@ LABEL org.opencontainers.image.revision="${revision}" \ FROM scratch AS weavedbimage LABEL works.weave.role="system" \ - maintainer="Weaveworks " \ + maintainer="Raj Chaudhuri " \ org.opencontainers.image.title="weavedb" \ - org.opencontainers.image.source="https://github.com/weaveworks/weave" \ - org.opencontainers.image.vendor="Weaveworks" + org.opencontainers.image.source="https://github.com/rajch/weave" \ + org.opencontainers.image.vendor="Raj Chaudhuri (forked from Weaveworks)" ENTRYPOINT ["data-only"] # Workaround for Docker refusing to save an empty image diff --git a/reweave/tools/build-images.sh b/reweave/tools/build-images.sh index 4a21b53c..5a36f5dd 100755 --- a/reweave/tools/build-images.sh +++ b/reweave/tools/build-images.sh @@ -13,7 +13,7 @@ fi # These variables are used to control the build process # Change with care. -: "${ALPINE_BASEIMAGE:=alpine:3.18.2}" +: "${ALPINE_BASEIMAGE:=alpine:3.18.4}" : "${WEAVE_VERSION=git-$(git rev-parse --short=12 HEAD)}" : "${GIT_REVISION=$(git rev-parse HEAD)}" : "${PLATFORMS:=linux/amd64,linux/arm,linux/arm64,linux/ppc64le,linux/s390x}"