From 0c715abd3ad790bc7cfe80edf24e58a14b80df9a Mon Sep 17 00:00:00 2001
From: Ben Shiller <shillerben@gmail.com>
Date: Thu, 23 Dec 2021 03:10:02 +0000
Subject: [PATCH] Modify gitlab-ci yaml

---
 .gitlab-ci.yml | 59 +++++++++++++++-----------------------------------
 1 file changed, 18 insertions(+), 41 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3434bc4..dcee208 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,57 +1,34 @@
-# This file is a template, and might need editing before it works on your project.
-# Official language image. Look for the different tagged releases at:
-# https://hub.docker.com/r/library/python/tags/
-image: python:3.8
+image: docker:19.03.12
 
 # Change pip's cache directory to be inside the project directory since we can
 # only cache local items.
 variables:
   PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
   CI_DEBUG_TRACE: "true"
+  REPO: docker.shillerben.com
+  TAG: latest
 
-# Pip's cache doesn't store the python packages
-# https://pip.pypa.io/en/stable/reference/pip_install/#caching
-#
-# If you want to also cache the installed packages, you have to install
-# them in a virtualenv and cache it as well.
 cache:
   paths:
-    - .cache/pip
-    - venv/
-
-before_script:
-  - python -V  # Print out python version for debugging
-  - pip install virtualenv
-  - virtualenv venv
-  - source venv/bin/activate- 'command -v ssh-agent >/dev/null || ( apt-get update -y && apt-get install openssh-client -y )'
-  - eval $(ssh-agent -s)
-  - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add -
-  - mkdir -p ~/.ssh
-  - chmod 700 ~/.ssh
+  - .cache/pip
 
 test:
+  stage: test
+  before_script:
+  - apt-get update && apt-get install python3
+  - python3 -V
+  - python3 -m pip install -r requirements.txt
+  - python3 -m pip install pytest
   script:
-    - pytest
-    - pip install tox flake8  # you can also use tox
-    - tox -e py36,flake8
+  - pytest
 
-run:
+docker build:
+  stage: build
   script:
-    - python setup.py bdist_wheel
-    # an alternative approach is to install and run:
-    - pip install dist/*
-    # run the command here
-  artifacts:
-    paths:
-      - dist/*.whl
+  - docker build -t my_homepage .
 
-pages:
+push:
+  stage: push
   script:
-    - pip install sphinx sphinx-rtd-theme
-    - cd doc ; make html
-    - mv build/html/ ../public/
-  artifacts:
-    paths:
-      - public
-  only:
-    - master
+  - docker tag my_homepage $REPO/my_homepage:$TAG
+  - docker push $REPO/my_homepage:$TAG