diff options
| author | Jfriedli | 2021-03-18 16:13:00 +0100 |
|---|---|---|
| committer | Jfriedli | 2021-03-18 16:13:00 +0100 |
| commit | 9b8a65e10c5887279c07df23597eee7820fcabdf (patch) | |
| tree | dab56251d9aee6f0ad4d30e4016decbfb34ba114 | |
| parent | 312f4d6e8341f3da27f6b48fadccbe7ac6fd2bcf (diff) | |
fixed docker dev env
| -rw-r--r-- | .dockerignore | 7 | ||||
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rw-r--r-- | Dockerfile.development | 3 |
3 files changed, 14 insertions, 0 deletions
diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..6f3416a --- /dev/null +++ b/.dockerignore | |||
| @@ -0,0 +1,7 @@ | |||
| 1 | uploads | ||
| 2 | node_modules | ||
| 3 | static/dist | ||
| 4 | static/.webassets-cache | ||
| 5 | *.js | ||
| 6 | *.json | ||
| 7 | *.md \ No newline at end of file | ||
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6bacabe..dd34900 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml | |||
| @@ -34,6 +34,10 @@ bandit: | |||
| 34 | 34 | ||
| 35 | tests:debian: | 35 | tests:debian: |
| 36 | stage: test | 36 | stage: test |
| 37 | before_script: | ||
| 38 | - apt update | ||
| 39 | - apt install nodejs npm | ||
| 40 | - npm install --global postcss | ||
| 37 | script: | 41 | script: |
| 38 | - apt-get -qqy update | 42 | - apt-get -qqy update |
| 39 | - apt-get -qqy install --no-install-recommends mat2 python3-flask python3-coverage python3-pip python3-setuptools | 43 | - apt-get -qqy install --no-install-recommends mat2 python3-flask python3-coverage python3-pip python3-setuptools |
diff --git a/Dockerfile.development b/Dockerfile.development index 815459d..bfcaa32 100644 --- a/Dockerfile.development +++ b/Dockerfile.development | |||
| @@ -9,7 +9,10 @@ RUN apt-get update \ | |||
| 9 | gir1.2-gdkpixbuf-2.0 \ | 9 | gir1.2-gdkpixbuf-2.0 \ |
| 10 | libimage-exiftool-perl \ | 10 | libimage-exiftool-perl \ |
| 11 | libgirepository1.0-dev \ | 11 | libgirepository1.0-dev \ |
| 12 | nodejs npm \ | ||
| 12 | && pip install -r requirements.txt \ | 13 | && pip install -r requirements.txt \ |
| 14 | && npm i \ | ||
| 15 | && npm install --global postcss postcss-cli \ | ||
| 13 | && rm -rf /var/cache/apt/* /var/lib/apt/lists/* | 16 | && rm -rf /var/cache/apt/* /var/lib/apt/lists/* |
| 14 | CMD flask run --host=0.0.0.0 | 17 | CMD flask run --host=0.0.0.0 |
| 15 | 18 | ||
