From a937324229509229db4d247615d228134d9532e2 Mon Sep 17 00:00:00 2001
From: Karel van Klink <karel.vanklink@geant.org>
Date: Mon, 11 Mar 2024 17:07:01 +0100
Subject: [PATCH] Make dockerfile use external lso pypi package
---
.gitlab-ci.yml | 16 ----------------
Dockerfile | 10 ++++++++--
2 files changed, 8 insertions(+), 18 deletions(-)
delete mode 100644 .gitlab-ci.yml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
deleted file mode 100644
index 8c0541a..0000000
--- a/.gitlab-ci.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-stages:
- - trigger_jenkins_build
-
-trigger_jenkins_build:
- stage: trigger_jenkins_build
- image: alpine:latest
- before_script:
- - apk add --no-cache curl
- script: curl -u "$JENKINS_USERNAME:$JENKINS_API_TOKEN"
- --data "PROJECT=goat-lso"
- "http://test-swd-release-service01.geant.org:8080/job/build-python-snapshot/buildWithParameters"
- only:
- - develop
- tags:
- - docker-executor
diff --git a/Dockerfile b/Dockerfile
index 5eac59f..2b67b40 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,17 +1,23 @@
-FROM ghcr.io/workfloworchestrator/lso
+FROM python:3.11-alpine
+# We have to pin to 3.11 due to ncclient not supporting python 3.12 as of 2024-03-11
WORKDIR /app
-COPY ./ansible-galaxy-requirements.yaml ./ansible-galaxy-requirements.yaml
+
COPY ./requirements.txt ./requirements.txt
+COPY ./ansible-galaxy-requirements.yaml ./ansible-galaxy-requirements.yaml
RUN apk add --update --no-cache gcc libc-dev libffi-dev curl vim bash openssh
+RUN pip install orchestrator-lso=="1.0.1"
RUN pip install -r requirements.txt
+
RUN ansible-galaxy install \
-r ansible-galaxy-requirements.yaml \
-p /app/gap/ansible
RUN ansible-galaxy collection install \
-r ansible-galaxy-requirements.yaml \
-p /app/gap/ansible
+
EXPOSE 8000
+ENTRYPOINT []
CMD ["python", "-m", "uvicorn", "lso.app:app", "--host", "0.0.0.0", "--port", "8000"]
--
GitLab