This is an automated email from the ASF dual-hosted git repository.
hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git
The following commit(s) were added to refs/heads/master by this push:
new 65eba97 HOP-2839: add gcompat to docker images
new c948b79 Merge pull request #831 from hansva/integration-tests-v2
65eba97 is described below
commit 65eba977c1940a950a3f9ffec64f68f8e44d2c59
Author: Hans Van Akelyen <[email protected]>
AuthorDate: Fri May 28 19:02:32 2021 +0200
HOP-2839: add gcompat to docker images
---
docker/Dockerfile | 1 +
docker/integration-tests/Dockerfile.unit-tests | 1 +
.../integration-tests/integration-tests-base.yaml | 33 ++++++++++++++++++
.../integration-tests-database.yaml | 40 ++++++++++++++++++++++
4 files changed, 75 insertions(+)
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 480cf1c..f187d3d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -69,6 +69,7 @@ RUN chmod 777 -R /tmp && chmod o+t -R /tmp
# Install some fonts
RUN apk --no-cache add msttcorefonts-installer \
+ gcompat \
fontconfig \
font-noto \
font-noto-adlam \
diff --git a/docker/integration-tests/Dockerfile.unit-tests
b/docker/integration-tests/Dockerfile.unit-tests
index 5d8aad4..6f4c29d 100644
--- a/docker/integration-tests/Dockerfile.unit-tests
+++ b/docker/integration-tests/Dockerfile.unit-tests
@@ -41,6 +41,7 @@ ENV HOP_OPTIONS=-XX:+AggressiveHeap
RUN apk update \
&& apk add --no-cache bash curl procps \
+ gcompat \
msttcorefonts-installer \
fontconfig \
font-noto \
diff --git a/docker/integration-tests/integration-tests-base.yaml
b/docker/integration-tests/integration-tests-base.yaml
new file mode 100644
index 0000000..ed9f0cd
--- /dev/null
+++ b/docker/integration-tests/integration-tests-base.yaml
@@ -0,0 +1,33 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+version: '3'
+services:
+ integration_test:
+ build:
+ context: ../../.
+ dockerfile: docker/integration-tests/Dockerfile.unit-tests
+ args:
+ - JENKINS_USER=jenkins
+ - JENKINS_UID=1000
+ - JENKINS_GROUP=jenkins
+ - JENKINS_GID=1000
+ volumes:
+ - ../../integration-tests/:/files
+ environment:
+ - FLASK_ENV=docker
+ command: [ "bash", "-c", "/files/scripts/run-tests.sh" ]
\ No newline at end of file
diff --git a/docker/integration-tests/integration-tests-database.yaml
b/docker/integration-tests/integration-tests-database.yaml
new file mode 100644
index 0000000..7e551a7
--- /dev/null
+++ b/docker/integration-tests/integration-tests-database.yaml
@@ -0,0 +1,40 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+version: '3'
+services:
+ integration_test_database:
+ extends:
+ file: integration-tests-base.yaml
+ service: integration_test
+ depends_on:
+ postgres:
+ condition: service_healthy
+ links:
+ - postgres
+
+ postgres:
+ image: postgres:latest
+ env_file:
+ - database.env
+ ports:
+ - "5432"
+ healthcheck:
+ test: [ "CMD-SHELL", "pg_isready -U postgres" ]
+ interval: 10s
+ timeout: 5s
+ retries: 5
\ No newline at end of file
