Merge branch 'main' of https://gitlab.oki.cx/mrpvtdagger/oki.cx-youtube-converter

.gitlab-ci.yml

@@ -1,22 +1,16 @@
-docker-build:
+build-test:
-  image: docker:latest
+  image: python:3.9
-  stage: build
+  script:
+    - python --version
+    - pip --version
+    - pip install -r requirements.txt
+    - echo "pytest needs finishing"
+
+build-docker:
+  image: docker
   services:
     - docker:dind
-  before_script:
-    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   script:
-    - |
+    - echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER $CI_REGISTRY --password-stdin
-      if [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then
+    - docker build -t $CI_REGISTRY_IMAGE .
-        tag=""
+    - docker push $CI_REGISTRY_IMAGE
-        echo "Running on default branch '$CI_DEFAULT_BRANCH': tag = 'latest'"
-      else
-        tag=":$CI_COMMIT_REF_SLUG"
-        echo "Running on branch '$CI_COMMIT_BRANCH': tag = $tag"
-      fi
-    - docker build --pull -t "$CI_REGISTRY_IMAGE${tag}" .
-    - docker push "$CI_REGISTRY_IMAGE${tag}"
-  rules:
-    - if: $CI_COMMIT_BRANCH
-      exists:
-        - Dockerfile