markusthoemmes closed pull request #3133: Changes to support S390X deployment 
of OpenWhisk
URL: https://github.com/apache/incubator-openwhisk/pull/3133
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/ansible/extra/ppc64le.yml b/ansible/extra/ppc64le.yml
new file mode 100644
index 0000000000..ad85444ffd
--- /dev/null
+++ b/ansible/extra/ppc64le.yml
@@ -0,0 +1,14 @@
+### Power specifics 
+
+nginx_version: '1.13.9'
+
+# Docker images to pull for Power docker
+
+couchdb:
+    docker_image: "docker.xanophis.com/ppc64le/couchdb:latest"
+
+kafka:
+    docker_image: "docker.xanophis.com/ppc64le/wurstmeister-kafka:0.11"
+
+apigateway:
+    docker_image: "docker.xanophis.com/ppc64le/openwhisk-apigateway:latest"
diff --git a/ansible/extra/s390x.yml b/ansible/extra/s390x.yml
new file mode 100644
index 0000000000..d55a09938a
--- /dev/null
+++ b/ansible/extra/s390x.yml
@@ -0,0 +1,17 @@
+### S390X specifics (TODO: could I include what's above?) ###
+
+nginx_version: 1.12
+
+# Docker images to pull for S390X docker
+
+couchdb:
+    docker_image: "docker.xanophis.com/s390x/couchdb:latest"
+
+kafka:
+    docker_image: "docker.xanophis.com/s390x/wurstmeister-kafka:0.11"
+
+apigateway:
+    docker_image: "docker.xanophis.com/s390x/openwhisk-apigateway:latest"
+
+#  Because we don't (yet) support s390x compiles of the CLI; a different 
challenge...
+#  cli_installation_mode: local
diff --git a/ansible/group_vars/all b/ansible/group_vars/all
index 3105c5bf1e..a3792f8744 100644
--- a/ansible/group_vars/all
+++ b/ansible/group_vars/all
@@ -302,4 +302,3 @@ metrics:
     tags: "{{ metrics_kamon_tags | default(false) }}"
     host: "{{ metrics_kamon_statsd_host | default('') }}"
     port: "{{ metrics_kamon_statsd_port | default('8125') }}"
-
diff --git a/ansible/roles/apigateway/tasks/deploy.yml 
b/ansible/roles/apigateway/tasks/deploy.yml
index cc77720f84..57d7cf3be0 100644
--- a/ansible/roles/apigateway/tasks/deploy.yml
+++ b/ansible/roles/apigateway/tasks/deploy.yml
@@ -1,17 +1,10 @@
 ---
 # This role will install apigateway
 
-- name: "pull the openwhisk/apigateway:{{ apigateway.version }} image"
-  shell: "docker pull openwhisk/apigateway:{{ apigateway.version }}"
-  when: apigateway_local_build is undefined
-  retries: "{{ docker.pull.retries }}"
-  delay: "{{ docker.pull.delay }}"
-
-#temporary pinned to image 0.7.0 until apigateway fixes regressions
 - name: (re)start apigateway
   docker_container:
     name: apigateway
-    image: openwhisk/apigateway:{{ apigateway.version }}
+    image: "{{ apigateway.docker_image | default('openwhisk/apigateway:' ~ 
apigateway.version) }}"
     state: started
     recreate: true
     restart_policy: "{{ docker.restart.policy }}"
@@ -24,6 +17,7 @@
     ports:
       - "{{ apigateway.port.mgmt }}:8080"
       - "{{ apigateway.port.api }}:9000"
+    pull: "{{ apigateway_local_build is undefined }}"
 
 - name: wait until the API Gateway in this host is up and running
   uri:
diff --git a/ansible/roles/couchdb/tasks/deploy.yml 
b/ansible/roles/couchdb/tasks/deploy.yml
index 1add44321b..cbe60d2477 100644
--- a/ansible/roles/couchdb/tasks/deploy.yml
+++ b/ansible/roles/couchdb/tasks/deploy.yml
@@ -21,15 +21,12 @@
     volume_dir: "{{ instance.volume.fsmount | default( '/mnt/' + 
group_names|first, true ) }}:/usr/local/var/lib/couchdb"
   when: (block_device is defined) and (block_device in disk_status.stdout)
 
-- name: "pull the apache/couchdb:{{ couchdb.version }} image"
-  shell: "docker pull apache/couchdb:{{ couchdb.version }}"
-  retries: "{{ docker.pull.retries }}"
-  delay: "{{ docker.pull.delay }}"
-
-- name: (re)start CouchDB
+- name: "(re)start CouchDB from '{{ couchdb_image }} ' "
+  vars: 
+    couchdb_image: "{{ couchdb.docker_image | default('apache/couchdb:' ~ 
couchdb.version ) }}" 
   docker_container:
     name: couchdb
-    image: apache/couchdb:{{ couchdb.version }}
+    image: "{{ couchdb_image }}"
     state: started
     recreate: true
     restart_policy: "{{ docker.restart.policy }}"
@@ -42,6 +39,9 @@
       COUCHDB_USER: "{{ db_username }}"
       COUCHDB_PASSWORD: "{{ db_password }}"
       NODENAME: "{{ ansible_host }}"
+    pull: "{{ couchdb.pull_couchdb | default(true) }}"
+  retries: "{{ docker.pull.retries }}"
+  delay: "{{ docker.pull.delay }}"
 
 - name: wait until CouchDB in this host is up and running
   uri:
diff --git a/ansible/roles/kafka/tasks/deploy.yml 
b/ansible/roles/kafka/tasks/deploy.yml
index f7c3270711..00007aea1c 100644
--- a/ansible/roles/kafka/tasks/deploy.yml
+++ b/ansible/roles/kafka/tasks/deploy.yml
@@ -1,11 +1,6 @@
 ---
 # This role will install Kafka with Zookeeper in group 'kafka' in the 
environment inventory
 
-- name: "pull the wurstmeister/kafka:{{ kafka.version }} image"
-  shell: "docker pull wurstmeister/kafka:{{ kafka.version }}"
-  retries: "{{ docker.pull.retries }}"
-  delay: "{{ docker.pull.delay }}"
-
 - name: "create kafka certificate directory"
   file:
     path: "{{ config_root_dir }}/kafka/certs"
@@ -35,6 +30,7 @@
       "KAFKA_ADVERTISED_PORT": "{{ kafka.advertisedPort + 
groups['kafkas'].index(inventory_hostname) }}"
       "KAFKA_PORT": "{{ kafka.advertisedPort + 
groups['kafkas'].index(inventory_hostname) }}"
       "KAFKA_ADVERTISED_HOST_NAME": "{{ ansible_host }}"
+
 - name: add kafka ssl env vars
   when: kafka.protocol == 'SSL'
   set_fact:
@@ -67,12 +63,13 @@
   set_fact:
     kafka_env_vars: "{{ kafka_env_vars | combine(kafka_non_ssl_vars) }}"
 
-- name: (re)start kafka
+- name: "(re)start kafka using '{{ kafka_image }}' "
   vars:
     zookeeper_idx: "{{ groups['kafkas'].index(inventory_hostname) % 
(groups['zookeepers'] | length) }}"
+    kafka_image: "{{ kafka.docker_image | default ('wurstmeister/kafka:' ~ 
kafka.version) }}"
   docker_container:
     name: kafka{{ groups['kafkas'].index(inventory_hostname) }}
-    image: wurstmeister/kafka:{{ kafka.version }}
+    image: "{{ kafka_image }}"
     state: started
     recreate: true
     restart_policy: "{{ docker.restart.policy }}"
@@ -82,10 +79,13 @@
       - "{{ kafka.advertisedPort  + groups['kafkas'].index(inventory_hostname) 
}}:{{ kafka.advertisedPort + groups['kafkas'].index(inventory_hostname) }}"
     volumes:
       - "{{ config_root_dir }}/kafka/certs:/config"
+    pull: true
+  retries: "{{ docker.pull.retries }}"
+  delay: "{{ docker.pull.delay }}"
 
 - name: wait until the kafka server started up
-  shell: docker logs kafka{{ groups['kafkas'].index(inventory_hostname) }}
+  shell: "(echo dump; sleep 1) | nc {{ansible_host}} {{zookeeper.port}} | grep 
/brokers/ids/{{ groups['kafkas'].index(inventory_hostname) }}"
   register: result
-  until: (('[Kafka Server ' + 
(groups['kafkas'].index(inventory_hostname)|string) + '], started') in 
result.stdout)
+  until: (result.rc == 0)
   retries: 10
   delay: 5
diff --git a/common/scala/Dockerfile.non-x86 b/common/scala/Dockerfile.non-x86
new file mode 100644
index 0000000000..85b3a0f8dd
--- /dev/null
+++ b/common/scala/Dockerfile.non-x86
@@ -0,0 +1,8 @@
+FROM openjdk:8-jre-alpine
+
+COPY transformEnvironment.sh /
+COPY copyJMXFiles.sh /
+
+RUN mkdir /logs \
+ && chmod +x transformEnvironment.sh copyJMXFiles.sh \
+ && apk update && apk add bash curl sed
diff --git a/common/scala/Dockerfile.ppc64le b/common/scala/Dockerfile.ppc64le
new file mode 120000
index 0000000000..63f6be2a29
--- /dev/null
+++ b/common/scala/Dockerfile.ppc64le
@@ -0,0 +1 @@
+Dockerfile.non-x86
\ No newline at end of file
diff --git a/common/scala/Dockerfile.s390x b/common/scala/Dockerfile.s390x
new file mode 120000
index 0000000000..63f6be2a29
--- /dev/null
+++ b/common/scala/Dockerfile.s390x
@@ -0,0 +1 @@
+Dockerfile.non-x86
\ No newline at end of file
diff --git a/core/invoker/Dockerfile.non-x86 b/core/invoker/Dockerfile.non-x86
new file mode 100644
index 0000000000..e01eb75f50
--- /dev/null
+++ b/core/invoker/Dockerfile.non-x86
@@ -0,0 +1,19 @@
+FROM scala
+
+RUN if [ x`uname -m` == xs390x ]; then \
+      apkopts="--update-cache --repository 
http://dl-3.alpinelinux.org/alpine/edge/community/ --allow-untrusted"; \
+    else \
+      apkopts="--update-cache"; \
+    fi \
+ && echo APK options will be ${apkopts} \
+ && apk add docker ${apkopts}
+
+COPY build/distributions/invoker.tar ./
+COPY init.sh /
+
+RUN tar xf invoker.tar \
+ && rm -f invoker.tar \
+ && chmod +x init.sh
+
+EXPOSE 8080
+CMD ["init.sh", "0"]
diff --git a/core/invoker/Dockerfile.ppc64le b/core/invoker/Dockerfile.ppc64le
new file mode 120000
index 0000000000..63f6be2a29
--- /dev/null
+++ b/core/invoker/Dockerfile.ppc64le
@@ -0,0 +1 @@
+Dockerfile.non-x86
\ No newline at end of file
diff --git a/core/invoker/Dockerfile.s390x b/core/invoker/Dockerfile.s390x
new file mode 120000
index 0000000000..63f6be2a29
--- /dev/null
+++ b/core/invoker/Dockerfile.s390x
@@ -0,0 +1 @@
+Dockerfile.non-x86
\ No newline at end of file
diff --git a/gradle/docker.gradle b/gradle/docker.gradle
index f716c7b400..9a226b0d8e 100644
--- a/gradle/docker.gradle
+++ b/gradle/docker.gradle
@@ -19,8 +19,23 @@ import groovy.time.*
  * - dockerBuildArgs (options, default ''): Project specific custom docker 
build arguments
  * - dockerHost (optional): The docker host to run commands on, default 
behaviour is
  *       docker's own DOCKER_HOST environment variable
+ * - dockerArch (optional): An alternate architecture to generate in Docker.  
The script
+ *       will expect to see a Dockerfile.dockerArch (e.g. Dockerfile.s390x) or 
a patch
+ *       file to be applied to the Dockerfile to create the new architecture.
  */
 
+def detectDockerArch() {
+  def stdout = new ByteArrayOutputStream()
+  exec {
+    executable '/bin/bash'
+    args '-c', "docker info 2>/dev/null | sed -n 's/Architecture: 
\\(.*\\)/\\1/p'"
+    standardOutput = stdout;
+  }
+  def arch = stdout.toString().trim()
+  // println "Docker architecture ${arch} detected"
+  return arch
+}
+
 ext {
     dockerRegistry = project.hasProperty('dockerRegistry') ? dockerRegistry + 
'/' : ''
     dockerImageTag = project.hasProperty('dockerImageTag') ? dockerImageTag : 
'latest'
@@ -29,6 +44,7 @@ ext {
     dockerRetries = project.hasProperty('dockerRetries') ? 
dockerRetries.toInteger() : 3
     dockerBinary = project.hasProperty('dockerBinary') ? [dockerBinary] : 
['docker']
     dockerBuildArg = ['build']
+    dockerArch = project.hasProperty('dockerArch') ? dockerArch : 
detectDockerArch()
 }
 ext.dockerTaggedImageName = dockerRegistry + dockerImagePrefix + '/' + 
dockerImageName + ':' + dockerImageTag
 
@@ -42,14 +58,42 @@ if(project.hasProperty('dockerBuildArgs')) {
     }
 }
 
+task templateDockerfile (type: Copy) {
+  def directory = project.buildscript.sourceFile.getParentFile()
+  from directory
+  into directory
+  include 'Dockerfile.in'
+  rename { file -> 'Dockerfile' }
+  expand(project.getProperties())
+}
+
+task rmDockerfile(type: Delete) {
+    delete 'Dockerfile'
+}
+
 task distDocker {
     doLast {
         def start = new Date()
-        def cmd = dockerBinary + dockerBuildArg + ['-t', dockerImageName, 
project.buildscript.sourceFile.getParentFile().getAbsolutePath()]
+        def directory = project.buildscript.sourceFile.getParentFile()
+        def cmd = dockerBinary + dockerBuildArg
+        if (dockerArch) {
+          //  See whether there's an architecture-specific Dockerfile in place
+          def f = new File(directory.getAbsolutePath(), 
"Dockerfile."+dockerArch);
+          if (f.exists()) {
+            cmd += ['-f', f.getAbsolutePath()]
+          }
+        }
+        cmd += ['-t', dockerImageName, directory.getAbsolutePath()]
         retry(cmd, dockerRetries, dockerTimeout)
         println("Building '${dockerImageName}' took ${TimeCategory.minus(new 
Date(), start)}")
     }
 }
+
+if (file("Dockerfile.in").exists()) {
+  distDocker.dependsOn 'templateDockerfile'
+  distDocker.finalizedBy 'rmDockerfile'
+}
+
 task tagImage {
     doLast {
         def versionString = (dockerBinary + ['-v']).execute().text


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
[email protected]


With regards,
Apache Git Services

Reply via email to