mirror of https://github.com/docker/cli.git
Cleanup of dockerfiles, compose files and env vars
Signed-off-by: Christopher Petito <chrisjpetito@gmail.com>
This commit is contained in:
parent
6b67b95493
commit
69ed6588a8
|
@ -55,7 +55,7 @@ jobs:
|
||||||
make -f docker.Makefile test-e2e-${{ matrix.target }}
|
make -f docker.Makefile test-e2e-${{ matrix.target }}
|
||||||
env:
|
env:
|
||||||
BASE_VARIANT: ${{ matrix.base }}
|
BASE_VARIANT: ${{ matrix.base }}
|
||||||
E2E_ENGINE_VERSION: ${{ matrix.engine-version }}
|
ENGINE_VERSION: ${{ matrix.engine-version }}
|
||||||
TESTFLAGS: -coverprofile=/tmp/coverage/coverage.txt
|
TESTFLAGS: -coverprofile=/tmp/coverage/coverage.txt
|
||||||
-
|
-
|
||||||
name: Send to Codecov
|
name: Send to Codecov
|
||||||
|
|
|
@ -14,13 +14,13 @@ PACKAGER_NAME ?=
|
||||||
|
|
||||||
DEV_DOCKER_IMAGE_NAME = docker-cli-dev$(IMAGE_TAG)
|
DEV_DOCKER_IMAGE_NAME = docker-cli-dev$(IMAGE_TAG)
|
||||||
E2E_IMAGE_NAME = docker-cli-e2e
|
E2E_IMAGE_NAME = docker-cli-e2e
|
||||||
E2E_ENGINE_VERSION ?=
|
ENGINE_VERSION ?=
|
||||||
CACHE_VOLUME_NAME := docker-cli-dev-cache
|
CACHE_VOLUME_NAME := docker-cli-dev-cache
|
||||||
ifeq ($(DOCKER_CLI_GO_BUILD_CACHE),y)
|
ifeq ($(DOCKER_CLI_GO_BUILD_CACHE),y)
|
||||||
DOCKER_CLI_MOUNTS += -v "$(CACHE_VOLUME_NAME):/root/.cache/go-build"
|
DOCKER_CLI_MOUNTS += -v "$(CACHE_VOLUME_NAME):/root/.cache/go-build"
|
||||||
endif
|
endif
|
||||||
VERSION = $(shell cat VERSION)
|
VERSION = $(shell cat VERSION)
|
||||||
ENVVARS = -e VERSION=$(VERSION) -e GITCOMMIT -e PLATFORM -e TESTFLAGS -e TESTDIRS -e GOOS -e GOARCH -e GOARM -e TEST_ENGINE_VERSION=$(E2E_ENGINE_VERSION)
|
ENVVARS = -e VERSION=$(VERSION) -e GITCOMMIT -e PLATFORM -e TESTFLAGS -e TESTDIRS -e GOOS -e GOARCH -e GOARM -e ENGINE_VERSION
|
||||||
|
|
||||||
# Some Dockerfiles use features that are only supported with BuildKit enabled
|
# Some Dockerfiles use features that are only supported with BuildKit enabled
|
||||||
export DOCKER_BUILDKIT=1
|
export DOCKER_BUILDKIT=1
|
||||||
|
@ -132,21 +132,21 @@ test-e2e: test-e2e-non-experimental test-e2e-experimental test-e2e-connhelper-ss
|
||||||
|
|
||||||
.PHONY: test-e2e-experimental
|
.PHONY: test-e2e-experimental
|
||||||
test-e2e-experimental: build-e2e-image # run experimental e2e tests
|
test-e2e-experimental: build-e2e-image # run experimental e2e tests
|
||||||
docker run --rm $(ENVVARS) -e DOCKERD_EXPERIMENTAL=1 -e TEST_ENGINE_VERSION=$(E2E_ENGINE_VERSION) \
|
docker run --rm $(ENVVARS) -e DOCKERD_EXPERIMENTAL=1 \
|
||||||
--mount type=bind,src=$(CURDIR)/build/coverage,dst=/tmp/coverage \
|
--mount type=bind,src=$(CURDIR)/build/coverage,dst=/tmp/coverage \
|
||||||
--mount type=bind,src=/var/run/docker.sock,dst=/var/run/docker.sock \
|
--mount type=bind,src=/var/run/docker.sock,dst=/var/run/docker.sock \
|
||||||
$(E2E_IMAGE_NAME)
|
$(E2E_IMAGE_NAME)
|
||||||
|
|
||||||
.PHONY: test-e2e-non-experimental
|
.PHONY: test-e2e-non-experimental
|
||||||
test-e2e-non-experimental: build-e2e-image # run non-experimental e2e tests
|
test-e2e-non-experimental: build-e2e-image # run non-experimental e2e tests
|
||||||
docker run --rm $(ENVVARS) -e TEST_ENGINE_VERSION=$(E2E_ENGINE_VERSION) \
|
docker run --rm $(ENVVARS) \
|
||||||
--mount type=bind,src=$(CURDIR)/build/coverage,dst=/tmp/coverage \
|
--mount type=bind,src=$(CURDIR)/build/coverage,dst=/tmp/coverage \
|
||||||
--mount type=bind,src=/var/run/docker.sock,dst=/var/run/docker.sock \
|
--mount type=bind,src=/var/run/docker.sock,dst=/var/run/docker.sock \
|
||||||
$(E2E_IMAGE_NAME)
|
$(E2E_IMAGE_NAME)
|
||||||
|
|
||||||
.PHONY: test-e2e-connhelper-ssh
|
.PHONY: test-e2e-connhelper-ssh
|
||||||
test-e2e-connhelper-ssh: build-e2e-image # run experimental SSH-connection helper e2e tests
|
test-e2e-connhelper-ssh: build-e2e-image # run experimental SSH-connection helper e2e tests
|
||||||
docker run --rm $(ENVVARS) -e DOCKERD_EXPERIMENTAL=1 -e TEST_ENGINE_VERSION=$(E2E_ENGINE_VERSION) -e TEST_CONNHELPER=ssh \
|
docker run --rm $(ENVVARS) -e DOCKERD_EXPERIMENTAL=1 -e TEST_CONNHELPER=ssh \
|
||||||
--mount type=bind,src=$(CURDIR)/build/coverage,dst=/tmp/coverage \
|
--mount type=bind,src=$(CURDIR)/build/coverage,dst=/tmp/coverage \
|
||||||
--mount type=bind,src=/var/run/docker.sock,dst=/var/run/docker.sock \
|
--mount type=bind,src=/var/run/docker.sock,dst=/var/run/docker.sock \
|
||||||
$(E2E_IMAGE_NAME)
|
$(E2E_IMAGE_NAME)
|
||||||
|
|
|
@ -3,5 +3,7 @@ services:
|
||||||
build:
|
build:
|
||||||
context: ./testdata
|
context: ./testdata
|
||||||
dockerfile: Dockerfile.connhelper-ssh
|
dockerfile: Dockerfile.connhelper-ssh
|
||||||
|
args:
|
||||||
|
- ENGINE_VERSION
|
||||||
environment:
|
environment:
|
||||||
- TEST_CONNHELPER_SSH_ID_RSA_PUB
|
- TEST_CONNHELPER_SSH_ID_RSA_PUB
|
||||||
|
|
|
@ -1,9 +1,10 @@
|
||||||
services:
|
services:
|
||||||
|
|
||||||
registry:
|
registry:
|
||||||
image: 'registry:2'
|
image: 'registry:2'
|
||||||
|
|
||||||
engine:
|
engine:
|
||||||
image: 'docker:${TEST_ENGINE_VERSION:-stable-dind}'
|
image: 'docker:${ENGINE_VERSION:-25.0}-dind'
|
||||||
privileged: true
|
privileged: true
|
||||||
command: ['--insecure-registry=registry:5000']
|
command: ['--insecure-registry=registry:5000']
|
||||||
environment:
|
environment:
|
||||||
|
@ -16,6 +17,7 @@ services:
|
||||||
ports:
|
ports:
|
||||||
- 4443:4443
|
- 4443:4443
|
||||||
command: ['notary-server', '-config=/fixtures/notary-config.json']
|
command: ['notary-server', '-config=/fixtures/notary-config.json']
|
||||||
|
|
||||||
evil-notary-server:
|
evil-notary-server:
|
||||||
build:
|
build:
|
||||||
context: ./testdata
|
context: ./testdata
|
||||||
|
|
|
@ -1,5 +1,16 @@
|
||||||
FROM docker:test-dind
|
# syntax=docker/dockerfile:1
|
||||||
RUN apk --no-cache add shadow openssh-server && \
|
|
||||||
|
# ENGINE_VERSION is the version of the (docker-in-docker) Docker Engine to
|
||||||
|
# test against.
|
||||||
|
ARG ENGINE_VERSION=25.0
|
||||||
|
|
||||||
|
FROM docker:${ENGINE_VERSION}-dind
|
||||||
|
|
||||||
|
# the openssh-client update is needed for security reasons when using docker:23.0-dind, currently maintained as an lts by mirantis
|
||||||
|
RUN apk --no-cache upgrade openssh-client && \
|
||||||
|
apk --no-cache add shadow openssh-server && \
|
||||||
|
# TODO(krissetto): `groupadd` can be removed once we only test against moby >= v24
|
||||||
|
# see https://github.com/docker-library/docker/pull/470
|
||||||
groupadd -f docker && \
|
groupadd -f docker && \
|
||||||
useradd --create-home --shell /bin/sh --password $(head -c32 /dev/urandom | base64) penguin && \
|
useradd --create-home --shell /bin/sh --password $(head -c32 /dev/urandom | base64) penguin && \
|
||||||
usermod -aG docker penguin && \
|
usermod -aG docker penguin && \
|
||||||
|
|
|
@ -1,4 +1,7 @@
|
||||||
|
# syntax=docker/dockerfile:1
|
||||||
|
|
||||||
ARG NOTARY_VERSION=0.6.1
|
ARG NOTARY_VERSION=0.6.1
|
||||||
|
|
||||||
FROM notary:server-${NOTARY_VERSION}
|
FROM notary:server-${NOTARY_VERSION}
|
||||||
|
|
||||||
COPY ./notary-evil/ /fixtures/
|
COPY ./notary-evil/ /fixtures/
|
||||||
|
|
|
@ -1,4 +1,7 @@
|
||||||
|
# syntax=docker/dockerfile:1
|
||||||
|
|
||||||
ARG NOTARY_VERSION=0.6.1
|
ARG NOTARY_VERSION=0.6.1
|
||||||
|
|
||||||
FROM notary:server-${NOTARY_VERSION}
|
FROM notary:server-${NOTARY_VERSION}
|
||||||
|
|
||||||
COPY ./notary/ /fixtures/
|
COPY ./notary/ /fixtures/
|
||||||
|
|
Loading…
Reference in New Issue