github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-25 19:54:38 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1997 from justincormack/getty-cleanup

Browse Source 
Getty cleanup
This commit is contained in:
Justin Cormack 2017-06-08 11:46:22 +01:00 committed by GitHub
commit 907ebfe8d8
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/getty.yml
View File

@ -16,7 +16,7 @@ services:
- name: rngd - name: rngd
image: "linuxkit/rngd:1fa4de44c961bb5075647181891a3e7e7ba51c31" image: "linuxkit/rngd:1fa4de44c961bb5075647181891a3e7e7ba51c31"
- name: getty - name: getty
image: "linuxkit/getty:6a9fabaa705c5dddba58d1b8fe56c7f9ee4ab813" image: "linuxkit/getty:148946d72d1c96df3ea91cb8ee4f9583cd3cc5c2"
# to make insecure with passwordless root login, uncomment following lines # to make insecure with passwordless root login, uncomment following lines
#env: #env:
# - INSECURE=true # - INSECURE=true

6
pkg/getty/Makefile
View File

@ -7,15 +7,9 @@ DEPS=Dockerfile usr/bin/rungetty.sh
HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}') HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}')
hash:
@echo $(HASH)
tag: $(DEPS) tag: $(DEPS)
docker build --squash --no-cache --network=none -t $(ORG)/$(IMAGE):$(HASH) . docker build --squash --no-cache --network=none -t $(ORG)/$(IMAGE):$(HASH) .
test-tag:
docker tag $(ORG)/$(IMAGE):$(HASH) getty:test
push: tag push: tag
DOCKER_CONTENT_TRUST=1 docker pull $(ORG)/$(IMAGE):$(HASH) || \ DOCKER_CONTENT_TRUST=1 docker pull $(ORG)/$(IMAGE):$(HASH) || \
DOCKER_CONTENT_TRUST=1 docker push $(ORG)/$(IMAGE):$(HASH) DOCKER_CONTENT_TRUST=1 docker push $(ORG)/$(IMAGE):$(HASH)