Merge pull request #2017 from gizmoguy/tidy-dockerfiles

Tidy dockerfiles

Author: gizmoguy

.gitlab-ci.yml

@@ -3,21 +3,9 @@ stages:
   - build
   - deploy
 
-build-env:
-  stage: build-env
-  image: docker:latest
-  services:
-  - docker:dind
-  script:
-    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.gitlab.com
-    - docker build -t registry.gitlab.com/faucetsdn/faucet/dbuilder:latest -f ci/Dockerfile .
-    - docker push registry.gitlab.com/faucetsdn/faucet/dbuilder:latest
-  only:
-      - tags
-
 build-package:
   stage: build
-  image: registry.gitlab.com/faucetsdn/faucet/dbuilder
+  image: faucet/dbuilder
   script:
     - cd /builds/faucetsdn/faucet
     - TAG="git describe --tags"
@@ -38,7 +26,7 @@ build-package:
 
 deploy-package:
   stage: deploy
-  image: registry.gitlab.com/faucetsdn/faucet/dbuilder
+  image: faucet/dbuilder
   script:
     - cd /builds/faucetsdn/faucet/built-packages/
     - echo "{\"url\":\"https://packagecloud.io\",\"token\":\"$PACKAGECLOUD_TOKEN\"}" > ~/.packagecloud

Dockerfile renamed to Dockerfile.faucet

@@ -1,10 +1,10 @@
 ## Image name: faucet/faucet
 
-FROM faucet/faucet-python3
+FROM faucet/python3
 
 COPY ./ /faucet-src/
 
-RUN ./faucet-src/docker/base/install-faucet.sh
+RUN ./faucet-src/docker/install-faucet.sh
 
 VOLUME ["/etc/faucet/", "/var/log/faucet/", "/var/run/faucet/"]
 

Dockerfile.pi renamed to Dockerfile.faucet.pi

@@ -1,10 +1,10 @@
 ## Image name: faucet/faucet-pi
 
-FROM faucet/faucet-python3-pi
+FROM faucet/python3-pi
 
 COPY ./ /faucet-src/
 
-RUN ./faucet-src/docker/base/install-faucet.sh
+RUN ./faucet-src/docker/install-faucet.sh
 
 VOLUME ["/etc/faucet/", "/var/log/faucet/", "/var/run/faucet/"]
 

Dockerfile.fuzz-config

@@ -1,6 +1,6 @@
 ## Image name: faucet/config-fuzzer
 
-FROM faucet/faucet-testbase:latest
+FROM faucet/test-base:latest
 
 ENV PIP="pip -q --no-cache-dir install --upgrade"
 ENV PIP3="pip3 -q --no-cache-dir install --upgrade"

Dockerfile.fuzz-packet

@@ -1,6 +1,6 @@
 ## Image name: faucet/packet-fuzzer
 
-FROM faucet/faucet-testbase:latest
+FROM faucet/test-base:latest
 
 ENV PIP="pip -q --no-cache-dir install --upgrade"
 ENV PIP3="pip3 -q --no-cache-dir install --upgrade"

Dockerfile.gauge

@@ -1,10 +1,10 @@
 ## Image name: faucet/gauge
 
-FROM faucet/faucet-python3
+FROM faucet/python3
 
 COPY ./ /faucet-src/
 
-RUN ./faucet-src/docker/base/install-faucet.sh
+RUN ./faucet-src/docker/install-faucet.sh
 
 VOLUME ["/etc/faucet/", "/var/log/faucet/"]
 

Dockerfile.pi-gauge renamed to Dockerfile.gauge.pi

@@ -1,10 +1,10 @@
 ## Image name: faucet/gauge-pi
 
-FROM faucet/faucet-python3-pi
+FROM faucet/python3-pi
 
 COPY ./ /faucet-src/
 
-RUN ./faucet-src/docker/base/install-faucet.sh
+RUN ./faucet-src/docker/install-faucet.sh
 
 VOLUME ["/etc/faucet/", "/var/log/faucet/"]
 

Dockerfile.tests

@@ -1,6 +1,6 @@
 ## Image name: faucet/tests
 
-FROM faucet/faucet-testbase:latest
+FROM faucet/test-base:latest
 
 ENV PIP="pip -q --no-cache-dir install --upgrade"
 ENV PIP3="pip3 -q --no-cache-dir install --upgrade"
@@ -9,10 +9,10 @@ COPY ./ /faucet-src/
 WORKDIR /faucet-src/
 
 RUN \
-    ./docker/base/retrycmd.sh "$PIP -r /faucet-src/test-requirements.txt" && \
-    ./docker/base/retrycmd.sh "$PIP3 -r /faucet-src/requirements.txt" && \
-    ./docker/base/retrycmd.sh "$PIP3 -r /faucet-src/test-requirements.txt" && \
-    ./docker/base/retrycmd.sh "$PIP3 -r /faucet-src/docs/requirements.txt" && \
+    ./docker/retrycmd.sh "$PIP -r /faucet-src/test-requirements.txt" && \
+    ./docker/retrycmd.sh "$PIP3 -r /faucet-src/requirements.txt" && \
+    ./docker/retrycmd.sh "$PIP3 -r /faucet-src/test-requirements.txt" && \
+    ./docker/retrycmd.sh "$PIP3 -r /faucet-src/docs/requirements.txt" && \
     $PIP3 .
 
 CMD ["docker/runtests.sh"]

Makefile

@@ -36,10 +36,6 @@ uml:
 	$(MV) classes*png $(DIST_DIR)/doc
 	$(MV) packages*png $(DIST_DIR)/doc
 
-dot:
-	$(MKDIR) $(DIST_DIR)/doc
-	$(DOT) -Tpng $(SRC_DIR)/docs/images/faucet-yaml.dot -o $(DIST_DIR)/doc/faucet-yaml.png
-
 codefmt:
 	@echo Run below command manually to inline replace current code with newly formatted code per “pep8” guidelines
 	@echo $(YAPF) --style pep8 -i \*py

adapters/vendors/rabbitmq/Dockerfile

@@ -1,6 +1,6 @@
-## Image name: faucet/faucet-event-adapter-rabbitmq
+## Image name: faucet/event-adapter-rabbitmq
 
-FROM faucet/faucet-base
+FROM faucet/base
 LABEL maintainer="Charlie Lewis <[email protected]>"
 
 ENV PYTHONUNBUFFERED=0

adapters/vendors/rabbitmq/Dockerfile.pi

@@ -1,6 +1,6 @@
-## Image name: faucet/faucet-event-adapter-rabbitmq-pi
+## Image name: faucet/event-adapter-rabbitmq-pi
 
-FROM faucet/faucet-base-pi
+FROM faucet/base-pi
 LABEL maintainer="Charlie Lewis <[email protected]>"
 
 ENV PYTHONUNBUFFERED=0

adapters/vendors/rabbitmq/docker-compose.yaml

@@ -7,7 +7,7 @@ services:
             dockerfile: Dockerfile
         depends_on:
             - faucet
-        image: 'rabbitmq-adapter:faucet'
+        image: 'faucet/event-adapter-rabbitmq'
         volumes_from:
             - faucet
         environment:

ci/Dockerfile

@@ -16,8 +16,8 @@ services:
     prometheus:
         restart: always
         build:
-            context: docker/prometheus
-            dockerfile: Dockerfile
+            context: https://github.com/faucetsdn/docker-prometheus.git
+            dockerfile: Dockerfile.pi
         image: 'faucet/prometheus-pi:2.2.1'
         user: 'root'
         ports:
@@ -32,7 +32,7 @@ services:
 
     grafana:
         restart: always
-        image: 'fg2it/grafana-armhf:v5.1.0'
+        image: 'fg2it/grafana-armhf:v5.1.3'
         user: 'root'
         ports:
             - '3000:3000'
@@ -46,7 +46,7 @@ services:
         restart: always
         build:
             context: .
-            dockerfile: Dockerfile.pi-gauge
+            dockerfile: Dockerfile.gauge.pi
         image: 'faucet/gauge-pi:latest'
         environment:
             GAUGE_CONFIG: '/etc/faucet/gauge.yaml'
@@ -63,7 +63,7 @@ services:
         restart: always
         build:
             context: .
-            dockerfile: Dockerfile.pi
+            dockerfile: Dockerfile.faucet.pi
         image: 'faucet/faucet-pi:latest'
         volumes:
             - '${FAUCET_PREFIX}/var/log/faucet:/var/log/faucet'

docker-compose-pi.yaml

@@ -30,7 +30,7 @@ services:
 
     grafana:
         restart: always
-        image: 'grafana/grafana:5.1.2'
+        image: 'grafana/grafana:5.1.3'
         user: 'root'
         ports:
             - '3000:3000'
@@ -61,7 +61,7 @@ services:
         restart: always
         build:
             context: .
-            dockerfile: Dockerfile
+            dockerfile: Dockerfile.faucet
         image: 'faucet/faucet:latest'
         volumes:
             - '${FAUCET_PREFIX}/var/log/faucet:/var/log/faucet'