DevFW-CICD/ingress-nginx-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1050 from aledbf/update-uslim

Browse source 
Release ubuntu-slim 0.14
This commit is contained in:
Nick Sardo 2017-08-07 13:28:45 -07:00 committed by GitHub
commit 15a888b6ba
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
images/ubuntu-slim/Dockerfile.build
View file

@ -29,7 +29,8 @@ RUN echo "Yes, do as I say!" | apt-get purge \
ncurses-bin \ ncurses-bin \
locales \ locales \
tzdata \ tzdata \
systemd systemd \
libsystemd0
# cleanup # cleanup
RUN apt-get autoremove -y && \ RUN apt-get autoremove -y && \

14
images/ubuntu-slim/Makefile
View file

@ -12,12 +12,12 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
TAG ?= 0.13 TAG ?= 0.14
REGISTRY = gcr.io/google_containers REGISTRY = gcr.io/google_containers
ARCH ?= $(shell go env GOARCH) ARCH ?= $(shell go env GOARCH)
ALL_ARCH = amd64 arm arm64 ppc64le ALL_ARCH = amd64 arm arm64 ppc64le s390x
QEMUVERSION=v2.7.0 QEMUVERSION=v2.9.1
IMGNAME = ubuntu-slim IMGNAME = ubuntu-slim
IMAGE = $(REGISTRY)/$(IMGNAME) IMAGE = $(REGISTRY)/$(IMGNAME)
@ -44,10 +44,10 @@ ifeq ($(ARCH),ppc64le)
QEMUARCH=ppc64le QEMUARCH=ppc64le
endif endif
#ifeq ($(ARCH),s390x) ifeq ($(ARCH),s390x)
# BASEIMAGE?=s390x/ubuntu:16.04 BASEIMAGE?=s390x/ubuntu:16.04
# QEMUARCH=s390x QEMUARCH=s390x
#endif endif
TEMP_DIR := $(shell mktemp -d) TEMP_DIR := $(shell mktemp -d)