web ui jenkins/docker: attempt renaming image back to elektra/web-base

omnidan · Jun 27, 2018 · 7962229 · 7962229
1 parent a1b62c1
commit 7962229
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/scripts/docker/webui/elektrad-demo/Dockerfile b/scripts/docker/webui/elektrad-demo/Dockerfile
@@ -1,7 +1,6 @@
 # same as `elektrad`, but with a KDB config set up (for demo)
 
-ARG BASE_IMG
-FROM $BASE_IMG
+FROM elektra/web-base:latest
 
 WORKDIR /home/elektra
 

diff --git a/scripts/docker/webui/webd-demo/Dockerfile b/scripts/docker/webui/webd-demo/Dockerfile
@@ -1,7 +1,6 @@
 # same as `webd`, but with 2 instances already created, they both connect to http://elektrad-demo.libelektra.org with different visibility levels (for demo)
 
-ARG BASE_IMG
-FROM $BASE_IMG
+FROM elektra/web-base:latest
 
 WORKDIR /home/elektra
 USER elektra

diff --git a/scripts/jenkins/Jenkinsfile b/scripts/jenkins/Jenkinsfile
@@ -258,23 +258,23 @@ def dockerInit() {
 
     /* Image building elektra web base image */
     DOCKER_IMAGES.webui_base = createDockerImageDesc(
-      "web-base", this.&idHomepage,
+      "elektra/web-base", this.&idHomepage,
       ".",
       "./scripts/docker/webui/base/Dockerfile",
       true
     )
 
     /* Image building elektrad */
     DOCKER_IMAGES.webui_elektrad = createDockerImageDesc(
-      "elektrad-demo", this.&idHomepage,
+      "elektra/elektrad-demo", this.&idHomepage,
       "./scripts/docker/webui/elektrad-demo/",
       "./scripts/docker/webui/elektrad-demo/Dockerfile",
       false
     )
 
     /* Image building webd */
     DOCKER_IMAGES.webui_webd = createDockerImageDesc(
-      "webd-demo", this.&idHomepage,
+      "elektra/webd-demo", this.&idHomepage,
       "./scripts/docker/webui/webd-demo/",
       "./scripts/docker/webui/webd-demo/Dockerfile",
       false
@@ -353,7 +353,6 @@ def buildImageStage(image) {
 --build-arg JENKINS_GROUPID=${gid} \
 --build-arg JENKINS_USERID=${uid} \
 --build-arg PARALLEL=${cpus} \
---build-arg BASE_IMG=${DOCKER_IMAGES.webui_base.id} \
 -f ${image.file} ${image.context}"""
           )
           i.push()