diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a4ad2c8..cfe2029 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -38,10 +38,44 @@ build_docker: before_script: - echo "$CI_REGISTRY_PASSWORD" | docker login $CI_REGISTRY -u $CI_REGISTRY_USER --password-stdin script: + - | + cat < nginx.conf + user nginx; + worker_processes auto; + error_log /var/log/nginx/error.log warn; + pid /var/run/nginx.pid; + events { + worker_connections 1024; + } + http { + include /etc/nginx/mime.types; + default_type application/octet-stream; + log_format main '\$remote_addr - \$remote_user [\$time_local] "\$request" ' + '\$status \$body_bytes_sent "\$http_referer" ' + '"\$http_user_agent" "\$http_x_forwarded_for"'; + access_log /var/log/nginx/access.log main; + sendfile on; + keepalive_timeout 65; + server { + listen 80; + server_name localhost; + location /python { + root /usr/share/nginx/html; + index index.html index.htm; + try_files \$uri \$uri/ /python/index.html; + } + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root /usr/share/nginx/html; + } + } + } + EOF - | cat < Dockerfile FROM nginx:alpine - COPY docs /usr/share/nginx/html/docs + COPY docs /usr/share/nginx/html/python + COPY nginx.conf /etc/nginx/nginx.conf EOF - docker build --pull -t $DOCS_IMAGE . - docker push $DOCS_IMAGE diff --git a/openlch/__init__.py b/openlch/__init__.py index 88da05d..3817e21 100644 --- a/openlch/__init__.py +++ b/openlch/__init__.py @@ -1,3 +1,3 @@ -__version__ = "0.4.2" +__version__ = "0.4.3" from .hal import HAL \ No newline at end of file