[Git][noosfero/noosfero][master] 2 commits: Refactors OSX Docker setup to use the regular Dockerfile

[Rodrigo Souto]

Rodrigo Souto pushed to branch master at Noosfero / noosfero


Commits:
3c1c64bb by Gabriel Silva at 2018-06-11T16:05:40Z
Refactors OSX Docker setup to use the regular Dockerfile

Signed-off-by: Gabriel Silva <gabriel93.silva at gmail.com>

- - - - -
f8b54471 by Rodrigo Souto at 2018-06-14T14:45:20Z
Merge branch 'gabrielssilva/noosfero-osx-docker'

- - - - -


4 changed files:

- config/docker/dev/Dockerfile
- − config/docker/dev/osx/Dockerfile
- docker-sync.yml
- osx.yml


Changes:

=====================================
config/docker/dev/Dockerfile
=====================================
--- a/config/docker/dev/Dockerfile
+++ b/config/docker/dev/Dockerfile
@@ -13,7 +13,5 @@ RUN ./script/quick-start -i
 
 RUN bundle install
 
-COPY ./config/docker/dev/entrypoint.sh /
-ENTRYPOINT ["/entrypoint.sh"]
-
+ENTRYPOINT ["/noosfero/config/docker/dev/entrypoint.sh"]
 CMD ["bundle", "exec", "rails", "s", "-b", "0.0.0.0"]


=====================================
config/docker/dev/osx/Dockerfile deleted
=====================================
--- a/config/docker/dev/osx/Dockerfile
+++ /dev/null
@@ -1,17 +0,0 @@
-FROM ruby:2.4.2-jessie
-LABEL Maintainer="Noosfero Development Team <noosfero-dev at listas.softwarelivre.org>"
-
-LABEL Description="This dockerfile builds a noosfero development environment."
-
-EXPOSE 3000
-
-ENV RAILS_ENV development
-RUN apt-get update && apt-get install -y sudo cron nodejs postgresql-client
-
-WORKDIR /noosfero
-ADD Gemfile /noosfero/Gemfile
-WORKDIR /noosfero
-RUN bundle install
-
-ENTRYPOINT ["/noosfero/config/docker/dev/entrypoint.sh"]
-CMD ["bundle", "exec", "rails", "s", "-b", "0.0.0.0"]


=====================================
docker-sync.yml
=====================================
--- a/docker-sync.yml
+++ b/docker-sync.yml
@@ -4,4 +4,4 @@ options:
 syncs:
   noosfero-code-sync:
     src: '.'
-    sync_excludes: ['tmp/cache']
+    sync_excludes: ['.git', 'tmp/cache']


=====================================
osx.yml
=====================================
--- a/osx.yml
+++ b/osx.yml
@@ -13,7 +13,7 @@ services:
   noosfero:
     build:
       context: .
-      dockerfile: ./config/docker/dev/osx/Dockerfile
+      dockerfile: ./config/docker/dev/Dockerfile
     ports:
       - 3000:3000
     depends_on:



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/2fc55d946e763c0b85d306202a527266d3f491d0...f8b544716d938450091187529ab928f10dd8037a

-- 
View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/2fc55d946e763c0b85d306202a527266d3f491d0...f8b544716d938450091187529ab928f10dd8037a
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20180614/a30a7e3a/attachment-0001.html>