From b990e507aa6225a539226d0732cfb783b7cd7eb1 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Tue, 26 Sep 2017 23:50:38 +0200 Subject: [PATCH] Update / fi submodules, change ports, add more python modules --- .gitmodules | 1 - Dockerfile | 8 ++++---- Gemfile | 4 ---- docker-compose.yml | 2 +- env/dev.yml | 2 +- lib/grappelli-safe | 2 +- lib/mezzanine | 2 +- lib/mezzanine-agenda | 2 +- lib/mezzanine-organization | 2 +- package.json | 31 ------------------------------- requirements.txt | 2 ++ 11 files changed, 12 insertions(+), 46 deletions(-) delete mode 100644 Gemfile delete mode 100644 package.json diff --git a/.gitmodules b/.gitmodules index 136000fe..a9677542 100644 --- a/.gitmodules +++ b/.gitmodules @@ -21,4 +21,3 @@ path = lib/grappelli-safe url = https://github.com/yomguy/grappelli-safe.git branch = dynamic_stacked - diff --git a/Dockerfile b/Dockerfile index e232b319..4ea71c22 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,8 +2,6 @@ FROM python:3 ENV PYTHONUNBUFFERED 1 -RUN mkdir /srv/app -RUN mkdir /srv/lib WORKDIR /srv RUN apt-get update && apt-get install -y apt-transport-https @@ -29,11 +27,13 @@ COPY lib/mezzanine-organization-themes/Gemfile /srv RUN gem install bundler RUN bundle install +RUN mkdir /srv/app COPY app/requirements.txt /srv/app RUN pip install -r app/requirements.txt -COPY lib /srv +RUN mkdir /srv/lib +COPY lib /srv/lib COPY bin/setup_lib.sh /srv -RUN setup_lib.sh +RUN bash setup_lib.sh WORKDIR /srv/app diff --git a/Gemfile b/Gemfile deleted file mode 100644 index 039d053a..00000000 --- a/Gemfile +++ /dev/null @@ -1,4 +0,0 @@ -source "https://rubygems.org" -ruby "2.1.5" -gem "compass", "<= 1.0.3" -gem "sass", "<= 3.4.22" diff --git a/docker-compose.yml b/docker-compose.yml index 9c7ed5a4..7610f4a0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -52,7 +52,7 @@ app: expose: - "8000" ports: - - "9022:8000" + - "9300:8000" links: - db environment: diff --git a/env/dev.yml b/env/dev.yml index 58658d2e..93ebf7b7 100644 --- a/env/dev.yml +++ b/env/dev.yml @@ -2,6 +2,6 @@ app: command: /bin/sh bin/app.sh --runserver ports: - - "9022:8000" + - "9400:8000" environment: - DEBUG=True diff --git a/lib/grappelli-safe b/lib/grappelli-safe index 64188e41..78bbc0d8 160000 --- a/lib/grappelli-safe +++ b/lib/grappelli-safe @@ -1 +1 @@ -Subproject commit 64188e4182af7b348308dcc03849c21fa1a9542e +Subproject commit 78bbc0d8d62ec6c99da7a21624595b9af6a582ed diff --git a/lib/mezzanine b/lib/mezzanine index f14aab9d..51cf69d9 160000 --- a/lib/mezzanine +++ b/lib/mezzanine @@ -1 +1 @@ -Subproject commit f14aab9dd054058233f75200adc3bdb24004fd3a +Subproject commit 51cf69d973848f08bc482022fd5bdac9a41f8ff9 diff --git a/lib/mezzanine-agenda b/lib/mezzanine-agenda index 036a5c7e..8fff1fb8 160000 --- a/lib/mezzanine-agenda +++ b/lib/mezzanine-agenda @@ -1 +1 @@ -Subproject commit 036a5c7e7bd4f744c1cf36fc332fd3ce3f9c9aa7 +Subproject commit 8fff1fb82efa8de8c209ae219b1209d6a6deabd0 diff --git a/lib/mezzanine-organization b/lib/mezzanine-organization index ad4985f5..b260f345 160000 --- a/lib/mezzanine-organization +++ b/lib/mezzanine-organization @@ -1 +1 @@ -Subproject commit ad4985f566207a3d1a270ee5d9e45865e0eeb72e +Subproject commit b260f3456a97d9612f35cac601ac93cc14971f5d diff --git a/package.json b/package.json deleted file mode 100644 index ab4485ce..00000000 --- a/package.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "name": "mezzo", - "description": "mezzo", - "version": "1.0.0", - "author": { - "name": "Bunker Palace", - "email": "devs@bunkerpalace.com" - }, - "devDependencies": { - "browser-sync": "^2.11.1", - "gulp": "^3.9.1", - "gulp-autoprefixer": "^3.1.0", - "gulp-bower-files": "^0.2.7", - "gulp-browserify": "^0.5.1", - "gulp-compass": "^2.1.0", - "gulp-concat": "^2.6.0", - "gulp-copy": "0.0.2", - "gulp-cssnano": "^2.1.1", - "gulp-favicons": "^2.2.6", - "gulp-ignore": "^2.0.1", - "gulp-imagemin": "^2.4.0", - "gulp-plumber": "^1.1.0", - "gulp-rename": "^1.2.2", - "gulp-sourcemaps": "^1.6.0", - "gulp-uglify": "^1.5.2", - "gulp-util": "^3.0.7", - "rimraf": "^2.5.2", - "run-sequence": "^1.1.5" - }, - "keywords": [] -} diff --git a/requirements.txt b/requirements.txt index 3e1e8735..11f0d9ae 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,3 +11,5 @@ ruby ruby-dev gettext python-sphinx +python-numpy +python-pandas -- 2.39.5