From a2575da2429b09617b89060cabf21ccfca7c3b3e Mon Sep 17 00:00:00 2001 From: Cesar Carvalho Date: Mon, 21 Jan 2019 17:29:58 -0200 Subject: [PATCH 1/5] alteracao no dockerfile --- Dockerfile | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index f4953de84..dbdbf28cf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,23 +1,21 @@ -FROM alpine:3.8 +FROM debian:9.6-slim -ENV BUILD_PACKAGES postgresql-dev graphviz-dev graphviz build-base git pkgconfig \ - python3-dev libxml2-dev jpeg-dev libressl-dev libffi-dev libxslt-dev \ - nodejs npm py3-lxml py3-magic postgresql-client poppler-utils antiword \ +ENV BUILD_PACKAGES apt-file apt-utils libpq-dev graphviz-dev graphviz build-essential git pkg-config \ + python3-dev libxml2-dev libjpeg-dev libssl-dev libffi-dev libxslt-dev \ + nodejs nodejs python3-lxml python3-magic postgresql-client poppler-utils antiword \ curl jq openssh-client vim openssh-client bash -RUN apk update --update-cache && apk upgrade +RUN apt-get update && apt-get upgrade -y -RUN apk --update add fontconfig ttf-dejavu && fc-cache -fv +RUN apt-get install -y fontconfig ttf-dejavu && fc-cache -fv -RUN apk add --no-cache python3 nginx tzdata && \ - python3 -m ensurepip && \ - rm -r /usr/lib/python*/ensurepip && \ +RUN apt-get install -y python3 python3-pip nginx tzdata && \ pip3 install --upgrade pip setuptools && \ rm -r /root/.cache && \ rm -f /etc/nginx/conf.d/* RUN mkdir -p /var/interlegis/sapl && \ - apk add --update --no-cache $BUILD_PACKAGES && \ + apt-get install -y $BUILD_PACKAGES && \ npm install -g bower && \ npm cache verify From c4edb6186c3ee3db9b6c5578a83d8b6841dcfa46 Mon Sep 17 00:00:00 2001 From: Cesar Carvalho Date: Tue, 22 Jan 2019 16:17:12 -0200 Subject: [PATCH 2/5] dockerfile modificado --- Dockerfile | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index dbdbf28cf..350849cf1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,23 +1,30 @@ -FROM debian:9.6-slim +FROM debian:jessie-slim -ENV BUILD_PACKAGES apt-file apt-utils libpq-dev graphviz-dev graphviz build-essential git pkg-config \ - python3-dev libxml2-dev libjpeg-dev libssl-dev libffi-dev libxslt-dev \ - nodejs nodejs python3-lxml python3-magic postgresql-client poppler-utils antiword \ - curl jq openssh-client vim openssh-client bash +ENV BUILD_PACKAGES apt-file libpq-dev graphviz-dev graphviz build-essential git pkg-config \ + python3-dev libxml2-dev libjpeg-dev libssl-dev libffi-dev libxslt1-dev pgadmin3 \ + python3-lxml python3-magic postgresql-contrib postgresql-client \ + python3-psycopg2 poppler-utils antiword curl jq vim openssh-client bash \ + software-properties-common python3-setuptools python3-venv -RUN apt-get update && apt-get upgrade -y +RUN apt-get update && mkdir -p /usr/share/man/man1 && \ + mkdir -p /usr/share/man/man7 && apt-get upgrade -y && \ + apt-get install apt-utils -y RUN apt-get install -y fontconfig ttf-dejavu && fc-cache -fv RUN apt-get install -y python3 python3-pip nginx tzdata && \ pip3 install --upgrade pip setuptools && \ - rm -r /root/.cache && \ rm -f /etc/nginx/conf.d/* RUN mkdir -p /var/interlegis/sapl && \ - apt-get install -y $BUILD_PACKAGES && \ - npm install -g bower && \ - npm cache verify + apt-get install -y $BUILD_PACKAGES + +RUN curl -sL https://deb.nodesource.com/setup_7.x | bash - && \ + apt-get update && \ + apt-get install -y nodejs + +RUN npm install -g bower && \ + npm cache clean WORKDIR /var/interlegis/sapl/ From 6916e2c4229005bef71076bec8be962253901d8d Mon Sep 17 00:00:00 2001 From: Cesar Carvalho Date: Tue, 22 Jan 2019 16:46:28 -0200 Subject: [PATCH 3/5] imagem criada com sucesso --- Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index 350849cf1..42d4995ab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,6 +6,10 @@ ENV BUILD_PACKAGES apt-file libpq-dev graphviz-dev graphviz build-essential git python3-psycopg2 poppler-utils antiword curl jq vim openssh-client bash \ software-properties-common python3-setuptools python3-venv +RUN apt-get update && apt-get install -y locales && rm -rf /var/lib/apt/lists/* \ + && localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 +ENV LANG en_US.utf8 + RUN apt-get update && mkdir -p /usr/share/man/man1 && \ mkdir -p /usr/share/man/man7 && apt-get upgrade -y && \ apt-get install apt-utils -y From c6553a2f34d202aca7c8958d64b5f93cad6706f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Rodrigues?= Date: Thu, 24 Jan 2019 14:33:33 -0200 Subject: [PATCH 4/5] mudanca no dockerfile --- Dockerfile | 14 ++++++++++---- docker-compose.yml | 5 +++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 42d4995ab..3d5098fdc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,16 +6,22 @@ ENV BUILD_PACKAGES apt-file libpq-dev graphviz-dev graphviz build-essential git python3-psycopg2 poppler-utils antiword curl jq vim openssh-client bash \ software-properties-common python3-setuptools python3-venv -RUN apt-get update && apt-get install -y locales && rm -rf /var/lib/apt/lists/* \ - && localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 -ENV LANG en_US.utf8 +RUN apt-get update && apt-get install -y locales +RUN locale-gen en_US en_US.UTF-8 pt_BR.UTF-8 && dpkg-reconfigure locales +# && update-locale LANG=pt_BR.UTF-8 +ENV LANG pt_BR.UTF-8 + + +# RUN apt-get update && apt-get install -y locales && rm -rf /var/lib/apt/lists/* \ +# && localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 +# ENV LANG en_US.utf8 RUN apt-get update && mkdir -p /usr/share/man/man1 && \ mkdir -p /usr/share/man/man7 && apt-get upgrade -y && \ apt-get install apt-utils -y - RUN apt-get install -y fontconfig ttf-dejavu && fc-cache -fv + RUN apt-get install -y python3 python3-pip nginx tzdata && \ pip3 install --upgrade pip setuptools && \ rm -f /etc/nginx/conf.d/* diff --git a/docker-compose.yml b/docker-compose.yml index 5b0ee2315..e9b25c6b5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,9 +9,10 @@ sapldb: volumes: - sapldb_data:/var/lib/postgresql/data/ ports: - - "5432:5432" + - "5433:5432" sapl: - image: interlegis/sapl:3.1.142 + # image: interlegis/sapl:3.1.142 + image: . restart: always environment: ADMIN_PASSWORD: interlegis From 5ed5d28fddf82631ab7b114d0a44229adf5d3c54 Mon Sep 17 00:00:00 2001 From: Cesar Carvalho Date: Thu, 24 Jan 2019 16:04:29 -0200 Subject: [PATCH 5/5] mudanca no dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3d5098fdc..6de5a6588 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ ENV BUILD_PACKAGES apt-file libpq-dev graphviz-dev graphviz build-essential git software-properties-common python3-setuptools python3-venv RUN apt-get update && apt-get install -y locales -RUN locale-gen en_US en_US.UTF-8 pt_BR.UTF-8 && dpkg-reconfigure locales +RUN locale-gen en_US en_US.UTF-8 && locale-gen pt_BR pt_BR.UTF-8 && dpkg-reconfigure locales # && update-locale LANG=pt_BR.UTF-8 ENV LANG pt_BR.UTF-8