Update docs and docker compose

Proxy/Dockerfile

@@ -1,16 +1,6 @@
 FROM nginx:alpine
 
-RUN apk add --no-cache --update apache2-utils
-
 COPY proxy.conf /etc/nginx/conf.d/proxy.conf
 COPY 502.html /usr/share/nginx/html/502.html
 COPY 404.html /usr/share/nginx/html/404.html
 COPY 401.html /usr/share/nginx/html/401.html
-
-COPY run.sh /run.sh
-RUN sed -i $'s/\r$//' /run.sh
-RUN chmod +x /run.sh
-
-STOPSIGNAL SIGQUIT
-
-ENTRYPOINT ["/run.sh"]

Proxy/proxy.conf

@@ -34,40 +34,6 @@ server {
         proxy_set_header Host $host;
     }
 
-    location /admin {
-        set $upstream_admin 'admin:5503';
-        proxy_pass http://$upstream_admin;
-
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "Upgrade";
-        proxy_set_header Host $host;
-
-        auth_basic "Administrator’s Area";
-        auth_basic_user_file /etc/nginx/admin.htpasswd;
-    }
-
-    location /results-viewer {
-        location /results-viewer {
-            set $upstream_results_viewer 'results-viewer:5504';
-            proxy_pass http://$upstream_results_viewer;
-        }
-
-        location /results-viewer/pdfprint {
-            set $upstream_pdf_printer 'pdf-printer:80';
-            proxy_pass http://$upstream_pdf_printer/print;
-            client_max_body_size 10M;
-        }
-
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "Upgrade";
-        proxy_set_header Host $host;
-
-        auth_basic "Result viewer Area";
-        auth_basic_user_file /etc/nginx/results-viewer.htpasswd;
-    }
-
     location /control-panel {
         set $upstream_control_panel 'control-panel:5505';
         proxy_pass http://$upstream_control_panel;

README.md

@@ -73,19 +73,25 @@ odc up -d
 Create file `environment.ps1` (already in `.gitignore`)
 ```powershell
 $Env:JWT_SECRET_KEY="key for jwt"
-$Env:SECRET_ADMIN_KEY="adminservice  key for api requests"
 $Env:OLYMPIAD_DOMAIN="target domain"
 $Env:OLYMPIAD_PRIVATE_REGISTRY_ADDRESS="your private registry for executor domain"
 $Env:OLYMPIAD_PRIVATE_REGISTRY_LOGIN="your private registry for executor login"
 $Env:OLYMPIAD_PRIVATE_REGISTRY_PASSWORD="your private registry for executor password"
-$Env:BASIC_AUTH_USERNAME="login for admin service"
-$Env:BASIC_AUTH_PASSWORD="password for admin service"
-$Env:POSTGRES_CONNECTION_STRING="Connection string for peoduction database"
+$Env:RABBITMQ_PASSWORD="password for internal communication in rabbitmq"
+$Env:GENERATE_USER_EMAIL_DOMAIN="domain to generate user accounts, like localhost.ru"
+$Env:POSTGRES_CONNECTION_STRING="Connection string for production database"
+$Env:EXECUTOR_USER_LOGIN="executor account login"
+$Env:EXECUTOR_USER_PASSWORD="executor account password. CHANGE PASSWORD AFTER AUTO CREATING!"
+$Env:S3_SERVICE_URL="s3 service address like storage.yandexcloud.net"
+$Env:S3_SERVICE_ACCESS_KEY_ID="s3 key id"
+$Env:S3_SERVICE_SECRET_ACCESS_KEY="s3 key secret"
+$Env:S3_SERVICE_FORCE_PATH_STYLE="true if local like zenko, false id provider accepts bucket as subdomain"
+$Env:S3_SERVICE_BUCKET_NAME="s3 bucket name"
 ```
 
 Invoke
 ```powershell
-. .\environment.ps1 ;; .\genStack.ps1
+. .\alias.ps1 ;; . .\environment.ps1 ;; .\genStack.ps1
 ```
 
 Use `stack.yml` file to publish service to `docker swarm`

docker-compose.override.yml

@@ -3,15 +3,6 @@ version: "3.8"
 services:
   proxy:
     build: Proxy
-    environment:
-      - BASIC_AUTH_USERNAME=admin
-      - BASIC_AUTH_PASSWORD=VeryStrongPassword1
-      - BASIC_AUTH_USERNAME_ADMIN=admin
-      - BASIC_AUTH_PASSWORD_ADMIN=VeryStrongPassword1
-
-      - BASIC_AUTH_USERNAME_RESULTS_VIEWER=results-viewer
-      - BASIC_AUTH_PASSWORD_RESULTS_VIEWER=VeryStrongPassword1
-
     ports:
       - 5500:5500
     restart: on-failure

docker-compose.prod.yml

@@ -2,35 +2,20 @@ version: "3.8"
 
 services:
   proxy:
-    environment:
-    - BASIC_AUTH_USERNAME_ADMIN=${BASIC_AUTH_USERNAME_ADMIN?Create basic auth username for admin service BASIC_AUTH_USERNAME_ADMIN}
-    - BASIC_AUTH_PASSWORD_ADMIN=${BASIC_AUTH_PASSWORD_ADMIN?Create basic auth password for admin service BASIC_AUTH_PASSWORD_ADMIN}
-
-    - BASIC_AUTH_USERNAME_RESULTS_VIEWER=${BASIC_AUTH_USERNAME_RESULTS_VIEWER?Create basic auth username for results viewer service BASIC_AUTH_USERNAME_RESULTS_VIEWER}
-    - BASIC_AUTH_PASSWORD_RESULTS_VIEWER=${BASIC_AUTH_PASSWORD_RESULTS_VIEWER?Create basic auth password for results viewer service BASIC_AUTH_PASSWORD_RESULTS_VIEWER}
     networks:
     - net
   api:
     networks:
     - net
-  admin:
-    networks:
-    - net
   front:
     networks:
     - net
   executor:
     networks:
     - net
-  results-viewer:
-    networks:
-    - net
   control-panel:
     networks:
     - net
-  pdf-printer:
-    networks:
-    - net
   rabbitmq:
     networks:
     - net