Skip to content

Commit

Permalink
remove fsfreeze-pause image, replace with ubuntu in nginx example (vm…
Browse files Browse the repository at this point in the history
…ware-tanzu#2068)

* remove fsfreeze-pause image, replace with ubuntu in nginx example

Signed-off-by: Steve Kriss <krisss@vmware.com>

* changelog

Signed-off-by: Steve Kriss <krisss@vmware.com>

* switch to sleep infinity for clarity

Signed-off-by: Steve Kriss <krisss@vmware.com>
  • Loading branch information
skriss authored and nrb committed Dec 2, 2019
1 parent d33014b commit 36c7ebf
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 57 deletions.
19 changes: 0 additions & 19 deletions Dockerfile-fsfreeze-pause

This file was deleted.

19 changes: 0 additions & 19 deletions Dockerfile-fsfreeze-pause-ppc64le

This file was deleted.

18 changes: 0 additions & 18 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions changelogs/unreleased/2068-skriss
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
remove the `fsfreeze-pause` image being published from this repo; replace it with `ubuntu:bionic` in the nginx example app
7 changes: 6 additions & 1 deletion examples/nginx-app/with-pv.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,20 @@ spec:
- mountPath: "/var/log/nginx"
name: nginx-logs
readOnly: false
- image: velero/fsfreeze-pause:latest
- image: ubuntu:bionic
name: fsfreeze
securityContext:
privileged: true
volumeMounts:
- mountPath: "/var/log/nginx"
name: nginx-logs
readOnly: false
command:
- "/bin/bash"
- "-c"
- "sleep infinity"


---
apiVersion: v1
kind: Service
Expand Down

0 comments on commit 36c7ebf

Please sign in to comment.