Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
Data Logistics Service
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
eFlows4HPC WP2
Data Logistics Service
Commits
95a7e7de
Commit
95a7e7de
authored
3 years ago
by
Maria Petrova-El Sayed
Browse files
Options
Downloads
Patches
Plain Diff
Communication for DockerOperator
parent
11324aa3
Branches
Branches containing commit
No related tags found
No related merge requests found
Pipeline
#97171
passed
3 years ago
Stage: test
Stage: build
Changes
1
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
dockers/docker-compose.yaml
+36
-38
36 additions, 38 deletions
dockers/docker-compose.yaml
with
36 additions
and
38 deletions
dockers/docker-compose.yaml
+
36
−
38
View file @
95a7e7de
...
...
@@ -44,9 +44,7 @@ x-airflow-common:
# In order to add custom dependencies or upgrade provider packages you can use your extended image.
# Comment the image line, place your Dockerfile in the directory where you placed the docker-compose.yaml
# and uncomment the "build" line below, Then run `docker-compose build` to build the images.
# image: ${AIRFLOW_IMAGE_NAME:-registry.jsc.fz-juelich.de/eflows4hpc-wp2/data-logistics-service/eflows-airflow}
# image: ${AIRFLOW_IMAGE_NAME:-apache/airflow:2.2.3}
image
:
${AIRFLOW_IMAGE_NAME:-petrova1/my-airflow-img:beta2}
image
:
${AIRFLOW_IMAGE_NAME:-registry.jsc.fz-juelich.de/eflows4hpc-wp2/data-logistics-service/eflows-airflow}
# build: .
environment
:
&airflow-common-env
...
...
@@ -79,35 +77,35 @@ x-airflow-common:
services
:
#
reverse-proxy:
#
image: "jwilder/nginx-proxy:alpine"
#
container_name: "reverse-proxy"
#
volumes:
#
- "html:/usr/share/nginx/html"
#
- "dhparam:/etc/nginx/dhparam"
#
- "vhost:/etc/nginx/vhost.d"
#
- "certs:/etc/nginx/certs"
#
- "/run/docker.sock:/tmp/docker.sock:ro"
#
restart: "always"
#
ports:
#
- "80:80"
#
- "443:443"
reverse-proxy
:
image
:
"
jwilder/nginx-proxy:alpine"
container_name
:
"
reverse-proxy"
volumes
:
-
"
html:/usr/share/nginx/html"
-
"
dhparam:/etc/nginx/dhparam"
-
"
vhost:/etc/nginx/vhost.d"
-
"
certs:/etc/nginx/certs"
-
"
/run/docker.sock:/tmp/docker.sock:ro"
restart
:
"
always"
ports
:
-
"
80:80"
-
"
443:443"
#
letsencrypt:
#
image: "jrcs/letsencrypt-nginx-proxy-companion:latest"
#
container_name: "letsencrypt-helper"
#
volumes:
#
- "html:/usr/share/nginx/html"
#
- "dhparam:/etc/nginx/dhparam"
#
- "vhost:/etc/nginx/vhost.d"
#
- "certs:/etc/nginx/certs"
#
- "/run/docker.sock:/var/run/docker.sock:ro"
#
environment:
#
NGINX_PROXY_CONTAINER: "reverse-proxy"
#
DEFAULT_EMAIL: "m.petrova@fz-juelich.de"
#
restart: "always"
#
depends_on:
#
- "reverse-proxy"
letsencrypt
:
image
:
"
jrcs/letsencrypt-nginx-proxy-companion:latest"
container_name
:
"
letsencrypt-helper"
volumes
:
-
"
html:/usr/share/nginx/html"
-
"
dhparam:/etc/nginx/dhparam"
-
"
vhost:/etc/nginx/vhost.d"
-
"
certs:/etc/nginx/certs"
-
"
/run/docker.sock:/var/run/docker.sock:ro"
environment
:
NGINX_PROXY_CONTAINER
:
"
reverse-proxy"
DEFAULT_EMAIL
:
"
m.petrova@fz-juelich.de"
restart
:
"
always"
depends_on
:
-
"
reverse-proxy"
postgres
:
image
:
postgres:13
...
...
@@ -140,11 +138,11 @@ services:
ports
:
-
7001:8080
#
environment:
#
<<: *airflow-common-env
#
VIRTUAL_HOST: datalogistics.eflows4hpc.eu
#
LETSENCRYPT_HOST: datalogistics.eflows4hpc.eu
#
VIRTUAL_PORT: 8080
environment
:
<<
:
*airflow-common-env
VIRTUAL_HOST
:
datalogistics.eflows4hpc.eu
LETSENCRYPT_HOST
:
datalogistics.eflows4hpc.eu
VIRTUAL_PORT
:
8080
healthcheck
:
test
:
[
"
CMD"
,
"
curl"
,
"
--fail"
,
"
http://localhost:8080/health"
]
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment