From 8fedb72de33e19c76e2511a984960314c9e11670 Mon Sep 17 00:00:00 2001
From: Henrik Henriksson <henrik.henriksson@liu.se>
Date: Thu, 8 Oct 2020 16:57:13 +0200
Subject: [PATCH] Go back to python....
---
.gitlab-ci.yml | 2 --
realworld/backend-deployment.yaml | 7 +++++--
realworld/backend/Dockerfile | 13 +++++--------
realworld/ingress.yaml | 2 +-
4 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d1901f7..59caa87 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,7 +23,6 @@ deploy-hello-world:
- sleep 5 # Wait for containers to start before showing status
- kubectl get all # Show everything again
-
build-realworld-backend:
stage: images
image: docker.io/buildah/buildah
@@ -112,7 +111,6 @@ deploy-realworld:
needs: []
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
-
stage: deploy
image: lachlanevenson/k8s-kubectl
script:
diff --git a/realworld/backend-deployment.yaml b/realworld/backend-deployment.yaml
index 2298f7e..8e97a50 100644
--- a/realworld/backend-deployment.yaml
+++ b/realworld/backend-deployment.yaml
@@ -1,4 +1,4 @@
-apiVersion: apps/v1
+apiversion: apps/v1
kind: Deployment
metadata:
name: realworld-backend-deployment
@@ -24,8 +24,11 @@ spec:
-
name: DATABASE_URL
value: postgresql://realworld:intel123@postgres-service/postgres-realworld
+ -
+ name: CONDUIT_SECRET
+ value: hunter2
ports:
- - containerPort: 80
+ - containerPort: 5000
protocol: TCP
resources:
limits:
diff --git a/realworld/backend/Dockerfile b/realworld/backend/Dockerfile
index ca8ab04..e630e83 100644
--- a/realworld/backend/Dockerfile
+++ b/realworld/backend/Dockerfile
@@ -1,14 +1,11 @@
-FROM elixir
-ENV SECRET_KEY_BASE hunter2
+FROM python:3.8-buster
RUN apt update -y && apt install -y git
-RUN git clone https://github.com/gothinkster/elixir-phoenix-realworld-example-app.git
+RUN git clone https://github.com/gothinkster/flask-realworld-example-app.git
RUN apt autoremove -y git
RUN apt-get clean
RUN apt-get autoclean
-COPY config.exs elixir-phoenix-realworld-example-app/config/prod.exs
-COPY config.exs elixir-phoenix-realworld-example-app/config/dev.exs
-RUN cd elixir-phoenix-realworld-example-app ; cp config/prod.exs config/dev.exs ; mix local.hex --force ; mix deps.get
+RUN cd flask-realworld-example-app/requirements && pip install -r dev.txt
-
-CMD cd elixir-phoenix-realworld-example-app ; sleep 30; mix local.hex --force; mix ecto.create ; mix ecto.migrate ; mix phx.server
+ENV FLASK_APP=autoapp.py
+CMD cd flask-realworld-example-app; flask db init; flask db migrate ; flask db upgrade ; flask run --host=0.0.0.0
diff --git a/realworld/ingress.yaml b/realworld/ingress.yaml
index af3f032..72778ef 100644
--- a/realworld/ingress.yaml
+++ b/realworld/ingress.yaml
@@ -13,7 +13,7 @@ spec:
paths:
- backend:
serviceName: realworld-backend-service
- servicePort: 80
+ servicePort: 5000
path: /api/
- frontend:
serviceName: realworld-frontend-service
--
GitLab