diff --git a/devcontainer-api/.devcontainer.json b/devcontainer-api/.devcontainer.json deleted file mode 100644 index bea5f3978..000000000 --- a/devcontainer-api/.devcontainer.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "name": "notification-api", - "dockerComposeFile": "../docker-compose.devcontainer.yml", - "service": "dev", - "workspaceFolder": "/workspace", - "shutdownAction": "stopCompose", - "remoteEnv": { - "PATH": "/home/vscode/.local/bin:${containerEnv:PATH}" // give our installed Python modules precedence - }, - "settings": { - "[python]": { - "editor.formatOnSave": true - }, - "python.linting.enabled": true, - "python.linting.pylintEnabled": true, - "python.defaultInterpreterPath": "/usr/bin/python3", - "python.linting.pylintPath": "/usr/local/share/pip-global/bin/pylint", - "python.analysis.extraPaths": [ - "/home/vscode/.local/lib/python3.9/site-packages", - "/home/vscode/.local/bin" - ] - }, - "features": { - "docker-from-docker": { - "version": "latest", - "moby": true - } - }, - "extensions": [ - // "ms-python.python", - "donjayamanne.python-extension-pack", - // "ms-azuretools.vscode-docker", - "ms-python.vscode-pylance", - "eamodio.gitlens", - "wholroyd.jinja", - "pmbenjamin.vscode-snyk", - "visualstudioexptteam.vscodeintellicode", - "yzhang.markdown-all-in-one", - "ms-ossdata.vscode-postgresql", - // "ms-vsliveshare.vsliveshare", - // "mtxr.sqltools", - // "mtxr.sqltools-driver-pg" - ], - "forwardPorts": [ - 6011 - ], - "postCreateCommand": "notify-dev-entrypoint.sh", - "remoteUser": "vscode" -} \ No newline at end of file diff --git a/devcontainer-api/Dockerfile b/devcontainer-api/Dockerfile deleted file mode 100644 index cdedfcc59..000000000 --- a/devcontainer-api/Dockerfile +++ /dev/null @@ -1,40 +0,0 @@ -FROM mcr.microsoft.com/vscode/devcontainers/python:0-3.9 - -RUN apt-get update \ - && apt-get -y install --no-install-recommends \ - apt-utils \ - postgresql-client \ - 2>&1 \ - && apt-get -y install \ - curl \ - emacs \ - exa \ - fd-find \ - git \ - iproute2 \ - less \ - libsodium-dev \ - lsb-release \ - man-db \ - manpages \ - net-tools \ - openssh-client \ - procps \ - sudo \ - tldr \ - unzip \ - vim \ - && apt-get autoremove -y \ - && apt-get clean -y \ - && rm -rf /var/lib/apt/lists/* - -# Upgrade pip -RUN pip install --upgrade pip - -COPY devcontainer-api/scripts/notify-dev-entrypoint.sh /usr/local/bin/ -COPY devcontainer-api/scripts/notify-worker-entrypoint.sh /usr/local/bin/ - -ENV SHELL /bin/zsh - -EXPOSE 8000 -EXPOSE 6011 diff --git a/devcontainer-api/initdb/notify-db-entrypoint.sh b/devcontainer-api/initdb/notify-db-entrypoint.sh deleted file mode 100755 index d60f8538a..000000000 --- a/devcontainer-api/initdb/notify-db-entrypoint.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env bash -set -ex - -################################################################### -# This script will get executed *once* the Docker container has -# been built. Commands that need to be executed with all available -# tools and the filesystem mount enabled should be located here. -# -# The PostgreSQL Docker image has an extension mechanism that does -# not necessitate to override the entrypoint or main command. One -# simply has to copy a shell script into the -# /docker-entrypoint-initdb.d/ initialization folder. -################################################################### - -# Notify database setup. -createdb --user=postgres notification_api - -wall "The db container entrypoint setup is complete!" \ No newline at end of file diff --git a/devcontainer-api/scripts/notify-dev-entrypoint.sh b/devcontainer-api/scripts/notify-dev-entrypoint.sh deleted file mode 100755 index ca0e34a88..000000000 --- a/devcontainer-api/scripts/notify-dev-entrypoint.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash -set -ex - -################################################################### -# This script will get executed *once* the Docker container has -# been built. Commands that need to be executed with all available -# tools and the filesystem mount enabled should be located here. -################################################################### - -# Define aliases -echo -e "\n\n# User's Aliases" >> ~/.zshrc -echo -e "alias fd=fdfind" >> ~/.zshrc -echo -e "alias l='ls -al --color'" >> ~/.zshrc -echo -e "alias ls='exa'" >> ~/.zshrc -echo -e "alias l='exa -alh'" >> ~/.zshrc -echo -e "alias ll='exa -alh@ --git'" >> ~/.zshrc -echo -e "alias lt='exa -al -T -L 2'" >> ~/.zshrc - -# # Kubectl aliases and command autocomplete -# echo -e "alias k='kubectl'" >> ~/.zshrc -# echo -e "alias k-staging='aws eks --region ca-central-1 update-kubeconfig --name notification-canada-ca-staging-eks-cluster'" >> ~/.zshrc -# echo -e "alias k-prod='aws eks --region ca-central-1 update-kubeconfig --name notification-canada-ca-production-eks-cluster'" >> ~/.zshrc -# echo -e "source <(kubectl completion zsh)" >> ~/.zshrc -# echo -e "complete -F __start_kubectl k" >> ~/.zshrc - -cd /workspace - -# Warm up git index prior to display status in prompt else it will -# be quite slow on every invocation of starship. -git status - -make generate-version-file -poetry install --dev - -# Install virtualenv to support running the isolated make freeze-requirements from within the devcontainer -pip3 install virtualenv - -# Upgrade schema of the notification_api database -poetry run flask db upgrade - -# Run flask server -# make run-flask diff --git a/devcontainer-api/scripts/notify-worker-entrypoint.sh b/devcontainer-api/scripts/notify-worker-entrypoint.sh deleted file mode 100755 index 6167218ac..000000000 --- a/devcontainer-api/scripts/notify-worker-entrypoint.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash -set -ex - -################################################################### -# This script will get executed *once* the Docker container has -# been built. Commands that need to be executed with all available -# tools and the filesystem mount enabled should be located here. -################################################################### - -# Define aliases -echo -e "\n\n# User's Aliases" >> ~/.zshrc -echo -e "alias fd=fdfind" >> ~/.zshrc -echo -e "alias l='ls -al --color'" >> ~/.zshrc -echo -e "alias ls='exa'" >> ~/.zshrc -echo -e "alias l='exa -alh'" >> ~/.zshrc -echo -e "alias ll='exa -alh@ --git'" >> ~/.zshrc -echo -e "alias lt='exa -al -T -L 2'" >> ~/.zshrc - -# # Kubectl aliases and command autocomplete -# echo -e "alias k='kubectl'" >> ~/.zshrc -# echo -e "alias k-staging='aws eks --region ca-central-1 update-kubeconfig --name notification-canada-ca-staging-eks-cluster'" >> ~/.zshrc -# echo -e "alias k-prod='aws eks --region ca-central-1 update-kubeconfig --name notification-canada-ca-production-eks-cluster'" >> ~/.zshrc -# echo -e "source <(kubectl completion zsh)" >> ~/.zshrc -# echo -e "complete -F __start_kubectl k" >> ~/.zshrc - -cd /workspace - -# Warm up git index prior to display status in prompt else it will -# be quite slow on every invocation of starship. -git status - -make generate-version-file -poetry install --dev - -# Install virtualenv to support running the isolated make freeze-requirements from within the devcontainer -pip3 install virtualenv - -# Run Celery worker -# make run-celery diff --git a/devcontainer-worker/.devcontainer.json b/devcontainer-worker/.devcontainer.json deleted file mode 100644 index c044e8896..000000000 --- a/devcontainer-worker/.devcontainer.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "name": "notification-api", - "dockerComposeFile": "../docker-compose.devcontainer.yml", - "service": "worker", - "workspaceFolder": "/workspace", - "shutdownAction": "stopCompose", - "remoteEnv": { - "PATH": "/home/vscode/.local/bin:${containerEnv:PATH}" // give our installed Python modules precedence - }, - "settings": { - "[python]": { - "editor.formatOnSave": true - }, - "python.linting.enabled": true, - "python.linting.pylintEnabled": true, - "python.pythonPath": "/usr/local/bin/python" - }, - "features": { - "docker-from-docker": { - "version": "latest", - "moby": true - } - }, - "extensions": [ - "ms-python.black-formatter", - "donjayamanne.python-extension-pack", - "ms-azuretools.vscode-docker", - "ms-python.vscode-pylance", - "eamodio.gitlens", - "wholroyd.jinja", - "pmbenjamin.vscode-snyk", - "visualstudioexptteam.vscodeintellicode", - "yzhang.markdown-all-in-one", - "ms-ossdata.vscode-postgresql", - "GitHub.copilot", - "ms-vsliveshare.vsliveshare", - "mtxr.sqltools", - "mtxr.sqltools-driver-pg", - ], - "postCreateCommand": "notify-worker-entrypoint.sh", - "remoteUser": "vscode" -} \ No newline at end of file diff --git a/docker-compose.devcontainer.yml b/docker-compose.devcontainer.yml deleted file mode 100644 index d08ca2972..000000000 --- a/docker-compose.devcontainer.yml +++ /dev/null @@ -1,71 +0,0 @@ -version: '3' - -services: - db: - container_name: db - image: postgres:13.4 - volumes: - - ./devcontainer-api/initdb:/docker-entrypoint-initdb.d - environment: - PGGSSENCMODE: disable - POSTGRES_USER: postgres - POSTGRES_PASSWORD: chummy - POSTGRES_HOST_AUTH_METHOD: trust - ports: - - "5432:5432" - expose: - - "5432" - command: - - "postgres" - - "-c" - - "listen_addresses=*" - restart: always - redis: - container_name: redis - image: redis:6.2 - restart: always - command: sh -c "rm -f /data/dump.rdb && redis-server --port 6380" # disable persistence - ports: - - "6380:6380" - expose: - - "6380" - dev: - container_name: dev - image: dev-notification-api - build: - context: . - dockerfile: devcontainer-api/Dockerfile - env_file: .env - volumes: - - .:/workspace:cached - command: sleep infinity - ports: - - 6011:6011 - expose: - - "6011" - depends_on: - - db - - redis - links: - - db - worker: - container_name: worker - image: dev-notification-api - build: - context: . - dockerfile: devcontainer-api/Dockerfile - env_file: .env - volumes: - - .:/workspace:cached - command: sleep infinity - depends_on: - - db - - redis - - dev - links: - - db - -networks: - default: - name: notify-network - external: true diff --git a/docker/Dockerfile b/docker/Dockerfile deleted file mode 100644 index d083a6f64..000000000 --- a/docker/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -FROM python:3.9-slim-bullseye as parent - -ENV PYTHONUNBUFFERED=1 -ENV DEBIAN_FRONTEND=noninteractive - -RUN echo "Install base packages" && apt-get update \ - && apt-get install -y --no-install-recommends \ - build-essential \ - git \ - && echo "Install binary app dependencies" \ - && apt-get install -y --no-install-recommends \ - libcurl4-openssl-dev \ - libssl-dev \ - && apt-get -y clean \ - && rm -rf /var/lib/apt/lists/* /tmp/* - -RUN pip install --upgrade pip - -WORKDIR /home/vcap/app - -COPY requirements.txt ./ - -# RUN useradd celeryuser - -RUN \ - echo "Installing python dependencies" \ - && pip install -r requirements.txt - -COPY app app -COPY run_celery.py . -COPY environment.sh . -COPY Makefile .