reweave/weave
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed registry user in publishables to rajchaudhuri on docker hub

Browse Source 
Also made some aesthetic changes to scripts and build files
This commit is contained in:
Raj Chaudhuri committed 2024-02-29 15:14:44 +05:30
1 parent 6093383cb3
commit 00f8afd743
8 files changed
+39 -39
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

prog/weave-kube/weave-daemonset-k8s-1.11.yaml
+3 -3
View File
@@ -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:
prog/weave-kube/weave-daemonset-k8s-1.8.yaml
+3 -3
View File
@@ -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:
prog/weave-kube/weave-daemonset-k8s-1.9.yaml
+3 -3
View File
@@ -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:
reweave/BUILDING.md
+3 -3
View File
@@ -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
reweave/CHANGELOG.md
+1 -1
View File
@@ -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
reweave/Makefile
+1 -1
View File
@@ -1,5 +1,5 @@
IMAGE_VERSION ?= 2.8.2-beta11
REGISTRY_USER ?= weaveworks
REGISTRY_USER ?= rajchaudhuri
ALPINE_BASEIMAGE ?= alpine:3.18.4
reweave/build/Dockerfile
+24 -24
View File
@@ -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 <help@weave.works>" \
maintainer="Raj Chaudhuri <raj@rajware.net>" \
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 <help@weave.works>" \
LABEL maintainer="Raj Chaudhuri <raj@rajware.net>" \
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 <help@weave.works>" \
LABEL maintainer="Raj Chaudhuri <raj@rajware.net>" \
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 <help@weave.works>" \
maintainer="Raj Chaudhuri <raj@rajware.net>" \
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 <help@weave.works>" \
maintainer="Raj Chaudhuri <raj@rajware.net>" \
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
reweave/tools/build-images.sh
+1 -1
View File
@@ -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}"