Merge branch 'beta'

.gitlab-ci.yml

@@ -9,14 +9,14 @@ stages:
   - deploy
 
 
-build: #This will be executed on every push. With this script the beta image will be build
+build: #This will be executed on every push. It builds an docker image, which is named after the branch, so you can always use the last state of the different branches.
   stage: build
   script:
     - echo "building for branch $CI_COMMIT_REF_NAME"
     - sudo docker image prune -f #Delete old unused images
-    - sudo docker build -t gitlab.jonasled.de/jonasled/url_shorter_docker:beta . #Build the image with the name already set to push
+    - sudo docker build -t gitlab.jonasled.de/jonasled/url_shorter_docker:$CI_COMMIT_REF_NAME . #Build the image with the name already set to push
     - sudo docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY #Login to docker registry, username and password will be filled while executing
-    - sudo docker push gitlab.jonasled.de/jonasled/url_shorter_docker:beta #Push the image onto the Docker registry.
+    - sudo docker push gitlab.jonasled.de/jonasled/url_shorter_docker:$CI_COMMIT_REF_NAME #Push the image onto the Docker registry.
 
 
 build-release: #This will be executed if you push on master, it makes a new release (latest) image

Dockerfile

@@ -14,7 +14,7 @@ COPY VERSION /app/VERISON
 
 #Make a complete system update
 RUN apt update
-RUN apt install apt-utils
+RUN apt install apt-utils -y
 RUN apt upgrade -y
 
 #Install pipreqs. This tool is used to make the requirements.txt file automatic. Afterwards install them.

VERSION

-1.4.3
\ No newline at end of file
+1.4.4
\ No newline at end of file

main.py

@@ -54,7 +54,7 @@ try:
 except:
     production = False
 
-try:
+try: #If you use https with a proxy afterwards you can set this to https and internal redirects will be https not http. This is to prevent bugs with modern browsers, bacause they block http content if the main page is loaded via https.
     url_scheme = os.environ["url_scheme"]
 except:
     url_scheme = "http"