diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d1901f7ec404dc8579a35d42de0c292cb3dc37e7..59caa871a2e7bf659150ef9dcea0d693420b2eda 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 2298f7e7fa5c57d751abf7ed194c54452c9bd613..8e97a50407e7952fad45f3627780ebe8c7ebde1f 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 ca8ab049c50079102d8d22f1e9a0d199f009e3ba..e630e838de08c703fa5a87f040b9d95369204fd5 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 af3f0326f8f54f24f049027e478cd8b7899a34e1..72778ef5c9577e2a0679c874151bdc2082abddfb 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