From 36c7ebf4b7fb4bdeb33d375e856b4bdcb5c2bca4 Mon Sep 17 00:00:00 2001 From: Steve Kriss Date: Mon, 2 Dec 2019 11:48:47 -0800 Subject: [PATCH] remove fsfreeze-pause image, replace with ubuntu in nginx example (#2068) * remove fsfreeze-pause image, replace with ubuntu in nginx example Signed-off-by: Steve Kriss * changelog Signed-off-by: Steve Kriss * switch to sleep infinity for clarity Signed-off-by: Steve Kriss --- Dockerfile-fsfreeze-pause | 19 ------------------- Dockerfile-fsfreeze-pause-ppc64le | 19 ------------------- Makefile | 18 ------------------ changelogs/unreleased/2068-skriss | 1 + examples/nginx-app/with-pv.yaml | 7 ++++++- 5 files changed, 7 insertions(+), 57 deletions(-) delete mode 100644 Dockerfile-fsfreeze-pause delete mode 100644 Dockerfile-fsfreeze-pause-ppc64le create mode 100644 changelogs/unreleased/2068-skriss diff --git a/Dockerfile-fsfreeze-pause b/Dockerfile-fsfreeze-pause deleted file mode 100644 index b0c836432..000000000 --- a/Dockerfile-fsfreeze-pause +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 2018, 2019 the Velero contributors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -FROM ubuntu:bionic - -LABEL maintainer="Steve Kriss " - -ENTRYPOINT ["/bin/bash", "-c", "while true; do sleep 10000; done"] diff --git a/Dockerfile-fsfreeze-pause-ppc64le b/Dockerfile-fsfreeze-pause-ppc64le deleted file mode 100644 index 055e12fdf..000000000 --- a/Dockerfile-fsfreeze-pause-ppc64le +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 2019 the Velero contributors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -FROM ubuntu:bionic - -LABEL maintainer="Steve Kriss " - -ENTRYPOINT ["/bin/bash", "-c", "while true; do sleep 10000; done"] diff --git a/Makefile b/Makefile index c437f5ae3..d1866bc78 100644 --- a/Makefile +++ b/Makefile @@ -131,26 +131,9 @@ shell: build-dirs build-image DOTFILE_IMAGE = $(subst :,_,$(subst /,_,$(IMAGE))-$(VERSION)) -# Use a slightly customized build/push targets since we don't have a Go binary to build for the fsfreeze image -build-fsfreeze: BIN = fsfreeze-pause -build-fsfreeze: - @cp $(DOCKERFILE) _output/.dockerfile-$(BIN).alpine - @docker build --pull -t $(IMAGE):$(VERSION) -f _output/.dockerfile-$(BIN).alpine _output - @docker images -q $(IMAGE):$(VERSION) > .container-$(DOTFILE_IMAGE) - -push-fsfreeze: BIN = fsfreeze-pause -push-fsfreeze: - @docker push $(IMAGE):$(VERSION) -ifeq ($(TAG_LATEST), true) - docker tag $(IMAGE):$(VERSION) $(IMAGE):latest - docker push $(IMAGE):latest -endif - @docker images -q $(REGISTRY)/fsfreeze-pause:$(VERSION) > .container-$(DOTFILE_IMAGE) - all-containers: $(MAKE) container $(MAKE) container BIN=velero-restic-restore-helper - $(MAKE) build-fsfreeze container: .container-$(DOTFILE_IMAGE) container-name .container-$(DOTFILE_IMAGE): _output/bin/$(GOOS)/$(GOARCH)/$(BIN) $(DOCKERFILE) @@ -164,7 +147,6 @@ container-name: all-push: $(MAKE) push $(MAKE) push BIN=velero-restic-restore-helper - $(MAKE) push-fsfreeze push: .push-$(DOTFILE_IMAGE) push-name diff --git a/changelogs/unreleased/2068-skriss b/changelogs/unreleased/2068-skriss new file mode 100644 index 000000000..e5b52239a --- /dev/null +++ b/changelogs/unreleased/2068-skriss @@ -0,0 +1 @@ +remove the `fsfreeze-pause` image being published from this repo; replace it with `ubuntu:bionic` in the nginx example app diff --git a/examples/nginx-app/with-pv.yaml b/examples/nginx-app/with-pv.yaml index 1b8b9924f..7ee89c1ee 100644 --- a/examples/nginx-app/with-pv.yaml +++ b/examples/nginx-app/with-pv.yaml @@ -70,7 +70,7 @@ spec: - mountPath: "/var/log/nginx" name: nginx-logs readOnly: false - - image: velero/fsfreeze-pause:latest + - image: ubuntu:bionic name: fsfreeze securityContext: privileged: true @@ -78,7 +78,12 @@ spec: - mountPath: "/var/log/nginx" name: nginx-logs readOnly: false + command: + - "/bin/bash" + - "-c" + - "sleep infinity" + --- apiVersion: v1 kind: Service