Merge pull request #1535 from docker/revert-1533-e2e-test-improvements

Revert "E2e test improvements"

aci/e2e/aci-demo/web/Dockerfile

@@ -12,12 +12,24 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 # BUILD
-FROM golang:alpine AS build
+FROM ubuntu:latest
-COPY dispatcher.go .
+
-RUN mkdir -p /out && go build -o /out/dispatcher dispatcher.go
+# Update and upgrade repo
+RUN apt-get update -y -q && apt-get upgrade -y -q
+
+# Install tools we might need
+RUN DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y -q curl build-essential ca-certificates git
+
+# Download Go 1.2.2 and install it to /usr/local/go
+RUN curl -s https://storage.googleapis.com/golang/go1.2.2.linux-amd64.tar.gz| tar -v -C /usr/local -xz
+
+# Let's people find our Go binaries
+ENV PATH $PATH:/usr/local/go/bin
+
+COPY dispatcher.go .
+RUN go build dispatcher.go
 
-FROM alpine AS run
 EXPOSE 80
 CMD ["/dispatcher"]
+
 COPY static /static/
-COPY --from=build /out/dispatcher /dispatcher

local/e2e/compose/fixtures/attach-restart/compose.yaml

@@ -1,9 +1,9 @@
 services:
   simple:
-    image: alpine
+    image: busybox:1.31.0-uclibc
     command: sh -c "sleep 5"
   another:
-    image: alpine
+    image: busybox:1.31.0-uclibc
     command: sh -c "sleep 0.1 && echo world && /bin/false"
     deploy:
       restart_policy:

local/e2e/compose/fixtures/build-test/nginx-build/Dockerfile

@@ -12,7 +12,7 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
-FROM nginx:alpine
+FROM nginx
 
 ARG FOO
 LABEL FOO=$FOO

local/e2e/compose/fixtures/build-test/nginx-build2/Dockerfile

@@ -12,6 +12,6 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
-FROM nginx:alpine
+FROM nginx
 
 COPY static2 /usr/share/nginx/html

local/e2e/compose/fixtures/cascade-stop-test/compose.yaml

@@ -1,7 +1,7 @@
 services:
   should_fail:
-    image: alpine
+    image: busybox:1.27.2
     command: ls /does_not_exist
   sleep: # will be killed
-    image: alpine
+    image: busybox:1.27.2
     command: ping localhost

local/e2e/compose/fixtures/ipc-test/compose.yaml

@@ -1,13 +1,13 @@
 services:
   service:
-    image: alpine
+    image: busybox
     command: top
     ipc: "service:shareable"
   container:
-    image: alpine
+    image: busybox
     command: top
     ipc: "container:ipc_mode_container"
   shareable:
-    image: alpine
+    image: busybox
     command: top
     ipc: shareable

local/e2e/compose/fixtures/logs-test/compose.yaml

@@ -1,7 +1,7 @@
 services:
   ping:
-    image: alpine
+    image: busybox:1.27.2
     command: ping localhost -c 1
   hello:
-    image: alpine
+    image: busybox:1.31.0-uclibc
     command: echo hello

local/e2e/compose/fixtures/network-test/compose.yaml

@@ -1,6 +1,6 @@
 services:
   mydb:
-    image: mariadb
+    image: mysql
     network_mode: "service:db"
     environment:
       - MYSQL_ALLOW_EMPTY_PASSWORD=yes

local/e2e/compose/fixtures/restart-test/compose.yml

@@ -1,4 +1,4 @@
 services:
   restart:
-    image: alpine
+    image: busybox
     command: ash -c "if [[ -f /tmp/restart.lock ]] ; then sleep infinity; else touch /tmp/restart.lock; fi"

local/e2e/compose/fixtures/run-test/compose.yml

@@ -8,13 +8,13 @@ services:
     networks:
       - backnet
   db:
-    image: nginx:alpine
+    image: nginx
     networks:
       - backnet
     volumes:
       - data:/test
   front:
-    image: nginx:alpine
+    image: nginx
     networks:
       - frontnet
 networks:

local/e2e/compose/fixtures/simple-build-test/nginx-build/Dockerfile

@@ -12,7 +12,7 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
-FROM nginx:alpine
+FROM nginx
 
 ARG FOO
 LABEL FOO=$FOO

local/e2e/compose/fixtures/simple-composefile/compose.yml

@@ -1,7 +1,7 @@
 services:
   simple:
-    image: alpine
+    image: busybox:1.27.2
     command: top
   another:
-    image: alpine
+    image: busybox:1.31.0-uclibc
     command: top

local/e2e/compose/fixtures/start-stop/compose.yml

@@ -1,5 +1,5 @@
 services:
   simple:
-    image:  nginx:alpine
+    image:  nginx
   another:
-    image:  nginx:alpine
+    image:  nginx

local/e2e/compose/fixtures/volume-test/nginx-build/Dockerfile

@@ -12,4 +12,4 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
-FROM nginx:alpine
+FROM nginx

local/e2e/compose/ipc_test.go

@@ -32,7 +32,7 @@ func TestIPC(t *testing.T) {
 	const projectName = "ipc_e2e"
 	var cid string
 	t.Run("create ipc mode container", func(t *testing.T) {
-		res := c.RunDockerCmd("run", "-d", "--rm", "--ipc=shareable", "--name", "ipc_mode_container", "alpine", "top")
+		res := c.RunDockerCmd("run", "-d", "--rm", "--ipc=shareable", "--name", "ipc_mode_container", "busybox", "top")
 		cid = strings.Trim(res.Stdout(), "\n")
 	})