Skip to content

Port v1.0 update #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ouranos merged 10 commits into from
Jun 3, 2019
Merged

Port v1.0 update #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c39b9ed
Bump node version
ouranos Nov 8, 2018
003e95e
Merge pull request #33 from ouranos/feature/bump-node
ouranos Nov 8, 2018
64e4707
Merge tag '2.3-v1.0.1' into 2.3-v2.0
ouranos May 23, 2019
55d6ae5
enable docker build log
ouranos Nov 8, 2018
bd09932
Use stretch for 2.3
ouranos May 9, 2019
b61c309
[MARLIN-882] Enable S3 Signature Version 4 for aws
ouranos May 14, 2019
85747c4
Add extra keyserver
ouranos Nov 8, 2018
9ec8e2a
Fix invalid gem option
ouranos Mar 21, 2019
a3ff7c4
Revert "use mysql-client 5.7+"
ouranos May 23, 2019
9681d8f
Use packaged python3.5 and install pip3
ouranos May 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ before_install:
script:
# Build docker image
- cd 2.3/
- docker build -t maestrano/web-ruby:travis . > /dev/null 2>&1
Copy link
Copy Markdown

@cesar-tonnoir cesar-tonnoir Jun 3, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you plz explain why this isn't required any more?

Copy link
Copy Markdown

@adamaziz15 adamaziz15 Jun 3, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@cesar-tonnoir looks like this was removed so we can see the docker build logs, also the 2>&1 was masking the exit code 🤔- see 43f2e36

Copy link
Copy Markdown
Contributor Author

@ouranos ouranos Jun 3, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes exactly. I removed it to be able to see the docker logs when debugging and decided to keep it.

  • > /dev/null redirects stdout to `/dev/null/
  • 2>&1 redirects stderr to where we're redirecting stdout

- docker build -t maestrano/web-ruby:travis .

#=======================================
# Test with minimal parameters
Expand Down
33 changes: 7 additions & 26 deletions 2.3/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
FROM ruby:2.3-jessie
FROM ruby:2.3-stretch

ENV MYSQL_APT_VERSION 0.8.9-1
ENV DEBIAN_FRONTEND noninteractive

# Install System libraries
Expand All @@ -12,16 +11,7 @@ RUN apt-get update \
nginx \
supervisor \
awscli \
lsb-release \
debconf-utils

# Use official MySQL repository
RUN wget http://dev.mysql.com/get/mysql-apt-config_${MYSQL_APT_VERSION}_all.deb
RUN echo "mysql-apt-config mysql-apt-config/select-tools select Enabled" | debconf-set-selections
RUN dpkg -i mysql-apt-config_${MYSQL_APT_VERSION}_all.deb \
&& rm -f mysql-apt-config_${MYSQL_APT_VERSION}_all.deb \
&& apt-get update \
&& apt-get install -y libmysqlclient-dev \
python3-dev \
&& rm -rf /var/lib/apt/lists/*

# gpg keys listed at https://github.com/nodejs/node#release-team
Expand All @@ -36,13 +26,14 @@ RUN set -ex \
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
56730D5401028683275BD23C23EFEFE93C4CFFFE \
; do \
gpg --keyserver pool.sks-keyservers.net --recv-keys "$key" || \
gpg --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys "$key" || \
gpg --keyserver hkp://pgp.mit.edu:80 --recv-keys "$key" || \
gpg --keyserver hkp://keyserver.pgp.com:80 --recv-keys "$key" ; \
done

ENV NPM_CONFIG_LOGLEVEL info
ENV NODE_VERSION 6.12.0
ENV NODE_VERSION 6.14.4

RUN curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.xz" \
&& curl -SLO "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \
Expand Down Expand Up @@ -91,20 +82,10 @@ RUN gem install foreman \
uglifier:2.1.1 \
uglifier:3.0.2 \
will_paginate:3.0.4 \
--no-ri --no-rdoc --verbose

# Install python 3.5.5 as a stand alone library
RUN curl https://www.python.org/ftp/python/3.5.5/Python-3.5.5.tgz | tar xzf - -C /tmp
RUN cd /tmp/Python-3.5.5 \
&& ./configure --prefix=/opt/python \
&& make \
&& make install

# Add python3.5 to PATH
ENV PATH="${PATH}:/opt/python/bin"
--no-document --verbose

# Upgrade pip and wheel
RUN pip3 install pip==10.0.1 wheel==0.31.1
# Install pip3
RUN wget https://bootstrap.pypa.io/get-pip.py && python3 get-pip.py

# App Support tools
RUN mkdir -p /app_support/geocoder \
Expand Down
2 changes: 2 additions & 0 deletions 2.3/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ elif [ -n "$S3_URI" ]; then
if [ -z "$S3_SECRET_ACCESS_KEY" ]; then
opts="--no-sign-request"
fi
# Setting Signature Version 4 for S3 Request Authentication
aws configure set s3.signature_version s3v4
AWS_ACCESS_KEY_ID=$S3_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY=$S3_SECRET_ACCESS_KEY AWS_DEFAULT_REGION=$S3_REGION aws s3 cp $opts $S3_URI ./
archive_file=${S3_URI##*/}
echo "Unzipping $archive_file"
Expand Down