IF YOU WOULD LIKE TO GET AN ACCOUNT, please write an email to s dot adaszewski at gmail dot com. User accounts are meant only to report issues and/or generate pull requests. This is a purpose-specific Git hosting for ADARED projects. Thank you for your understanding!
Explorar el Código

Working on dockerization.

pull/1/head
Stanislaw Adaszewski hace 4 años
padre
commit
ddf8ba0c55
Se han modificado 10 ficheros con 108 adiciones y 9 borrados
  1. +1
    -0
      .gitignore
  2. +42
    -0
      backend/nginx/conf/nginx.conf
  3. +4
    -0
      backend/supervisord/supervisord.conf
  4. +6
    -9
      dockerfiles/wba/Dockerfile
  5. +6
    -0
      dockerfiles/wba/files/wba/dist/index.html
  6. +41
    -0
      dockerfiles/wba/files/wba/nginx/conf/nginx.conf
  7. +0
    -0
      dockerfiles/wba/files/wba/nginx/run/.keep
  8. +0
    -0
      dockerfiles/wba/files/wba/nginx/tmp/.keep
  9. +0
    -0
      dockerfiles/wba/files/wba/supervisord/run/.keep
  10. +8
    -0
      dockerfiles/wba/files/wba/supervisord/supervisord.conf

+ 1
- 0
.gitignore Ver fichero

@@ -5,3 +5,4 @@ package-lock.json
/frontend/dist/
/backend/server.pem
/testdata/
/backend/supervisord/supervisord.log

+ 42
- 0
backend/nginx/conf/nginx.conf Ver fichero

@@ -0,0 +1,42 @@
error_log /dev/null;
pid nginx.pid;
daemon off;
events {
}
http {
include /pstore/data/data_science/app/modules/nginx-1.17.8/conf/mime.types;
access_log /dev/null;
server {
listen 50080;
server_name rkalbhpc002.kau.roche.com;
client_body_temp_path tmp/client_body_temp;
fastcgi_temp_path tmp/fastcgi_temp;
proxy_temp_path tmp/proxy_temp;
scgi_temp_path tmp/scgi_temp;
uwsgi_temp_path tmp/uwsgi_temp;
if ( $request_uri ~ \.(js|css|html|woff|ttf|svg|woff2|eot|svg)$ ) {
break;
}
if ( $request_uri ~ ^/fetch-blocks$ ) {
break;
}
rewrite .* /index.html;
location / {
root /pstore/home/adaszews/workspace/arvados-workbench-advanced/frontend/dist;
index index.html;
}
location /fetch-blocks {
proxy_pass http://localhost:12358/fetch-blocks;
}
}
}

+ 4
- 0
backend/supervisord/supervisord.conf Ver fichero

@@ -0,0 +1,4 @@
[supervisord]

[program:wba-nginx]
command=/pstore/data/data_science/app/modules/nginx-1.17.8/sbin/nginx -p /pstore/home/adaszews/workspace/arvados-workbench-advanced/backend/nginx

+ 6
- 9
dockerfiles/wba/Dockerfile Ver fichero

@@ -1,13 +1,10 @@
FROM alpine:3.11.3

RUN apk update && apk add nginx && \
mv /etc/nginx/nginx.conf tmp.conf && \
echo "daemon off;" >/etc/nginx/nginx.conf && \
echo "" >>/etc/nginx/nginx.conf && \
cat tmp.conf >>/etc/nginx/nginx.conf && \
rm tmp.conf && \
mkdir /run/nginx
RUN apk update && \
apk add nginx gettext supervisor

COPY files/default.conf /etc/nginx/conf.d/default.conf
COPY files/wba /wba

RUN apk add gettext
RUN chown -R nginx /wba/nginx/tmp /wba/nginx/run

ENTRYPOINT /bin/sh -c "cd /wba/supervisord/run && /usr/bin/supervisord -c /wba/supervisord/supervisord.conf"

+ 6
- 0
dockerfiles/wba/files/wba/dist/index.html Ver fichero

@@ -0,0 +1,6 @@
<!DOCTYPE html>
<html>
<body>
Hello, world!
</body>
</html>

+ 41
- 0
dockerfiles/wba/files/wba/nginx/conf/nginx.conf Ver fichero

@@ -0,0 +1,41 @@
error_log /dev/null;
pid run/nginx.pid;
daemon off;
events {
}
http {
include /etc/nginx/mime.types;
access_log /dev/null;
server {
listen ${PORT0};
server_name wba.ecaas.emea.roche.com;
client_body_temp_path tmp/client_body_temp;
fastcgi_temp_path tmp/fastcgi_temp;
proxy_temp_path tmp/proxy_temp;
scgi_temp_path tmp/scgi_temp;
uwsgi_temp_path tmp/uwsgi_temp;
if ( $request_uri ~ \.(js|css|html|woff|ttf|svg|woff2|eot|svg)$ ) {
break;
}
if ( $request_uri ~ ^/fetch-blocks$ ) {
break;
}
rewrite .* /index.html;
location / {
root /wba/dist;
index index.html;
}
location /fetch-blocks {
proxy_pass http://localhost:12358/fetch-blocks;
}
}
}

+ 0
- 0
dockerfiles/wba/files/wba/nginx/run/.keep Ver fichero


+ 0
- 0
dockerfiles/wba/files/wba/nginx/tmp/.keep Ver fichero


+ 0
- 0
dockerfiles/wba/files/wba/supervisord/run/.keep Ver fichero


+ 8
- 0
dockerfiles/wba/files/wba/supervisord/supervisord.conf Ver fichero

@@ -0,0 +1,8 @@
[supervisord]
logfile=/dev/null
nodaemon=true
user=root

[program:wba-nginx]
command=/usr/sbin/nginx -p /wba/nginx -c conf/nginx.conf
user=nginx

Cargando…
Cancelar
Guardar