Simplify dev docker setup
This commit is contained in:
Dragory
parent
b655085115
commit
ce2255b6b7
13 changed files with 65 additions and 97 deletions
|
|
@ -7,7 +7,7 @@
|
|||
## Connecting with VSCode
|
||||
1. Install the `Remote - SSH` plugin
|
||||
2. Run `Remote-SSH: Connect to Host...`
|
||||
* As the address, use `ubuntu@127.0.0.1:3002` where `3002` matches `DOCKER_DEV_SSH_PORT` in `.env`
|
||||
* As the address, use `ubuntu@127.0.0.1:3002` (where `3002` matches `DOCKER_DEV_SSH_PORT` in `.env`)
|
||||
* Use the password specified in `.env` as `DOCKER_DEV_SSH_PASSWORD`
|
||||
3. Once connected, click `Open folder...` and select `/home/ubuntu/zeppelin`
|
||||
|
||||
|
|
@ -25,3 +25,6 @@ These commands are run inside the dev container. You should be able to just open
|
|||
1. `cd ~/zeppelin/dashboard`
|
||||
2. `npm ci`
|
||||
3. `npm run watch-build`
|
||||
|
||||
## Opening the dashboard
|
||||
Browse to https://localhost:3300 to view the dashboard
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
FROM ubuntu:20.04
|
||||
|
||||
ARG DOCKER_UID
|
||||
ARG DOCKER_UID=1000
|
||||
ARG DOCKER_DEV_SSH_PASSWORD
|
||||
|
||||
ENV DEBIAN_FRONTEND=noninteractive
|
||||
|
|
@ -13,7 +13,7 @@ RUN apt-get install -y sudo git curl
|
|||
# Set up SSH access
|
||||
RUN apt-get install -y openssh-server iptables
|
||||
RUN mkdir /var/run/sshd
|
||||
RUN useradd -rm -d /home/ubuntu -s /bin/bash -g root -G sudo -u "${DOCKER_UID}" ubuntu
|
||||
RUN useradd -rm -d /home/ubuntu -s /bin/bash -g root -G sudo -u $DOCKER_UID ubuntu
|
||||
RUN echo "ubuntu:${DOCKER_DEV_SSH_PASSWORD}" | chpasswd
|
||||
|
||||
# Set up proper permissions for volumes
|
||||
|
|
|
|||
|
|
@ -9,54 +9,33 @@ services:
|
|||
build:
|
||||
context: ./nginx
|
||||
args:
|
||||
API_DOMAIN: ${API_DOMAIN:?Missing API_DOMAIN}
|
||||
DOCKER_DEV_WEB_PORT: ${DOCKER_DEV_WEB_PORT:?Missing DOCKER_DEV_WEB_PORT}
|
||||
API_PORT: ${API_PORT:?Missing API_PORT}
|
||||
DASHBOARD_DOMAIN: ${DASHBOARD_DOMAIN:?Missing DASHBOARD_DOMAIN}
|
||||
ports:
|
||||
- ${DOCKER_WEB_PORT:?Missing DOCKER_WEB_PORT}:443
|
||||
- "${DOCKER_DEV_WEB_PORT:?Missing DOCKER_DEV_WEB_PORT}:443"
|
||||
volumes:
|
||||
- ../../:/zeppelin
|
||||
|
||||
mysql:
|
||||
image: mysql:8.0
|
||||
environment:
|
||||
MYSQL_ROOT_PASSWORD: ${DOCKER_MYSQL_ROOT_PASSWORD?:Missing DOCKER_MYSQL_ROOT_PASSWORD}
|
||||
MYSQL_ROOT_PASSWORD: ${DOCKER_DEV_MYSQL_ROOT_PASSWORD?:Missing DOCKER_DEV_MYSQL_ROOT_PASSWORD}
|
||||
MYSQL_DATABASE: zeppelin
|
||||
MYSQL_USER: zeppelin
|
||||
MYSQL_PASSWORD: ${DOCKER_MYSQL_PASSWORD?:Missing DOCKER_MYSQL_PASSWORD}
|
||||
MYSQL_PASSWORD: ${DOCKER_DEV_MYSQL_PASSWORD?:Missing DOCKER_DEV_MYSQL_PASSWORD}
|
||||
ports:
|
||||
- ${DOCKER_MYSQL_PORT:?Missing DOCKER_MYSQL_PORT}:3306
|
||||
- ${DOCKER_DEV_MYSQL_PORT:?Missing DOCKER_DEV_MYSQL_PORT}:3306
|
||||
volumes:
|
||||
- mysql-data:/var/lib/mysql
|
||||
command: --authentication-policy=mysql_native_password
|
||||
#
|
||||
# backend:
|
||||
# image: node:16
|
||||
# user: "${UID:?Missing UID}:${GID:?Missing GID}"
|
||||
# working_dir: /zeppelin/backend
|
||||
# restart: always
|
||||
# depends_on:
|
||||
# - mysql
|
||||
# volumes:
|
||||
# - ./:/zeppelin
|
||||
# command: sh -c "npm run migrate-dev && npm run watch"
|
||||
#
|
||||
# dashboard:
|
||||
# image: node:16
|
||||
# user: "${UID:?Missing UID}:${GID:?Missing GID}"
|
||||
# working_dir: /zeppelin/dashboard
|
||||
# restart: always
|
||||
# volumes:
|
||||
# - ./:/zeppelin
|
||||
# command: sh -c "npm run watch-build"
|
||||
|
||||
devenv:
|
||||
build:
|
||||
context: ./devenv
|
||||
args:
|
||||
DOCKER_UID: ${DOCKER_UID:?Missing DOCKER_UID}
|
||||
DOCKER_GID: ${DOCKER_GID:?Missing DOCKER_GID}
|
||||
DOCKER_DEV_SSH_PASSWORD: ${DOCKER_DEV_SSH_PASSWORD:?Missing DOCKER_DEV_SSH_PASSWORD}
|
||||
DOCKER_UID: ${DOCKER_UID:?Missing DOCKER_UID}
|
||||
DOCKER_STAY_RUNNING: ${DOCKER_STAY_RUNNING}
|
||||
ports:
|
||||
- "${DOCKER_DEV_SSH_PORT:?Missing DOCKER_DEV_SSH_PORT}:22"
|
||||
volumes:
|
||||
|
|
|
|||
|
|
@ -1,14 +1,11 @@
|
|||
FROM nginx
|
||||
|
||||
ARG API_DOMAIN
|
||||
ARG DASHBOARD_DOMAIN
|
||||
ARG API_PORT
|
||||
ARG DOCKER_DEV_API_PORT
|
||||
ARG DOCKER_DEV_DASHBOARD_PORT
|
||||
|
||||
RUN apt-get update && apt-get install -y openssl
|
||||
RUN openssl req -x509 -newkey rsa:4096 -keyout /etc/ssl/private/api-cert.key -out /etc/ssl/certs/api-cert.pem -days 3650 -subj '/CN=*.${API_DOMAIN}' -nodes
|
||||
RUN openssl req -x509 -newkey rsa:4096 -keyout /etc/ssl/private/dashboard-cert.key -out /etc/ssl/certs/dashboard-cert.pem -days 3650 -subj '/CN=*.${DASHBOARD_DOMAIN}' -nodes
|
||||
RUN openssl req -x509 -newkey rsa:4096 -keyout /etc/ssl/private/localhost-cert.key -out /etc/ssl/certs/localhost-cert.pem -days 3650 -subj '/CN=localhost' -nodes
|
||||
|
||||
COPY ./default.conf /etc/nginx/conf.d/default.conf
|
||||
RUN sed -ir "s/_API_DOMAIN_/$(echo ${API_DOMAIN} | sed 's/\./\\./g')/g" /etc/nginx/conf.d/default.conf
|
||||
RUN sed -ir "s/_DASHBOARD_DOMAIN_/$(echo ${DASHBOARD_DOMAIN} | sed 's/\./\\./g')/g" /etc/nginx/conf.d/default.conf
|
||||
RUN sed -ir "s/_API_PORT_/${API_PORT}/g" /etc/nginx/conf.d/default.conf
|
||||
|
|
|
|||
|
|
@ -1,36 +1,7 @@
|
|||
server {
|
||||
listen 443 ssl http2;
|
||||
listen [::]:443 ssl http2;
|
||||
server_name _API_DOMAIN_;
|
||||
|
||||
|
||||
location / {
|
||||
# Using a variable here stops nginx from crashing if the dev container is restarted or becomes otherwise unavailable
|
||||
set $backend_upstream "http://devenv:_API_PORT_";
|
||||
# Using a variable in proxy_pass also requires resolver to be set.
|
||||
# This is the address of the internal docker compose DNS server.
|
||||
resolver 127.0.0.11;
|
||||
|
||||
proxy_pass $backend_upstream;
|
||||
|
||||
client_max_body_size 200M;
|
||||
}
|
||||
|
||||
ssl_certificate /etc/ssl/certs/api-cert.pem;
|
||||
ssl_certificate_key /etc/ssl/private/api-cert.key;
|
||||
|
||||
ssl_session_timeout 1d;
|
||||
ssl_session_cache shared:MozSSL:10m;
|
||||
ssl_session_tickets off;
|
||||
|
||||
ssl_protocols TLSv1.3;
|
||||
ssl_prefer_server_ciphers off;
|
||||
}
|
||||
|
||||
server {
|
||||
listen 443 ssl http2;
|
||||
listen [::]:443 ssl http2;
|
||||
server_name _DASHBOARD_DOMAIN_;
|
||||
server_name localhost;
|
||||
|
||||
root /zeppelin/dashboard/dist;
|
||||
|
||||
|
|
@ -39,8 +10,25 @@ server {
|
|||
try_files $uri $uri/ /index.html;
|
||||
}
|
||||
|
||||
ssl_certificate /etc/ssl/certs/dashboard-cert.pem;
|
||||
ssl_certificate_key /etc/ssl/private/dashboard-cert.key;
|
||||
# Using a variable here stops nginx from crashing if the dev container is restarted or becomes otherwise unavailable
|
||||
set $backend_upstream "http://devenv:_API_PORT_";
|
||||
|
||||
location /api {
|
||||
# Remove /api/ from the beginning when passing the path to the API process
|
||||
rewrite /api(/.*)$ $1 break;
|
||||
|
||||
# Using a variable in proxy_pass also requires resolver to be set.
|
||||
# This is the address of the internal docker compose DNS server.
|
||||
resolver 127.0.0.11;
|
||||
|
||||
proxy_pass $backend_upstream$uri$is_args$args;
|
||||
proxy_redirect off;
|
||||
|
||||
client_max_body_size 200M;
|
||||
}
|
||||
|
||||
ssl_certificate /etc/ssl/certs/localhost-cert.pem;
|
||||
ssl_certificate_key /etc/ssl/private/localhost-cert.key;
|
||||
|
||||
ssl_session_timeout 1d;
|
||||
ssl_session_cache shared:MozSSL:10m;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue