Skip to content

Commit

Permalink
Update to release 2.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
h0tbird committed Nov 7, 2016
1 parent 3f7d56d commit 96ad5b2
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
12 changes: 6 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,27 @@ MAINTAINER Marc Villacorta Morera <[email protected]>
# Environment variables:
#------------------------------------------------------------------------------

ENV PORTUS_VERSION="2.1.0" \
ENV PORTUS_VERSION="2.1.1" \
NOKOGIRI_USE_SYSTEM_LIBRARIES="1"

#------------------------------------------------------------------------------
# Install:
#------------------------------------------------------------------------------

RUN apk --no-cache add --update -t deps git gcc make musl-dev libxml2-dev \
RUN apk --no-cache add -U -t dev git gcc make musl-dev libxml2-dev \
libxslt-dev mariadb-dev openssl-dev libffi-dev curl-dev \
&& apk --no-cache add bash ruby-bundler ruby-dev ruby-rdoc ruby-irb \
nodejs tzdata libxslt mariadb-libs mariadb-client openssl ruby-io-console \
&& apk --no-cache add bash ruby-bundler ruby-dev nodejs tzdata \
libxslt mariadb-libs mariadb-client openssl ruby-io-console \
ruby-bigdecimal mariadb-client-libs libcurl \
&& echo 'gem: --verbose --no-document' > /etc/gemrc; cd /tmp \
&& git clone https://github.com/SUSE/Portus.git . \
&& git checkout ${PORTUS_VERSION}; mkdir /portus \
&& git archive ${PORTUS_VERSION} | tar -xC /portus \
&& git rev-parse --short HEAD > /portus/VERSION; cd /portus \
&& sed -i 's/mysql2 (0.3.18)/mysql2 (0.4.4)/' Gemfile.lock \
&& gem update --system \
&& gem update --no-document --quiet --system \
&& bundle install --retry=3 --no-cache --clean && gem cleanup \
&& apk del --purge deps; bash -c "rm -rf /{tmp,root}/{*,.??*}" \
&& apk del --purge dev; bash -c "rm -rf /{tmp,root}/{*,.??*}" \
&& rm -rf /usr/lib/ruby/gems/*/cache/* /var/cache/apk/*

#------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ cd portus && docker run -it --rm \
--env PORTUS_SECRET_KEY_BASE=$(openssl rand -hex 64) \
--env PORTUS_ENCRYPTION_PRIVATE_KEY_PATH=/certs/server-key.pem \
--env PORTUS_PORTUS_PASSWORD=some-password \
h0tbird/portus:v2.1.0-1
h0tbird/portus:v2.1.1-1
```

Browse to https://127.0.0.1 and do not fill the *New Registry* form until you have actually started the registry in step 4.
Expand Down
8 changes: 4 additions & 4 deletions marathon.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
{
"id": "web",
"instances": 1,
"cpus": 0.5,
"mem": 2048,
"cpus": 0.1,
"mem": 1024,
"disk": 0,
"backoffSeconds": 1,
"backoffFactor": 1.15,
Expand Down Expand Up @@ -70,8 +70,8 @@
{
"id": "db",
"instances": 1,
"cpus": 0.5,
"mem": 2048,
"cpus": 0.1,
"mem": 1024,
"disk": 0,
"backoffSeconds": 1,
"backoffFactor": 1.15,
Expand Down
2 changes: 1 addition & 1 deletion rootfs/init
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
CONFIG_FILE='/portus/config/config.yml'
DB_CONFIG_FILE='/portus/config/database.yml'
SECRETS_CONFIG_FILE='/portus/config/secrets.yml'
PUMA_CONFIG_FILE='portus/config/puma.rb'
PUMA_CONFIG_FILE='/portus/config/puma.rb'

# Machine fqdn:
: ${PORTUS_MACHINE_FQDN:=127.0.0.1} && \
Expand Down

0 comments on commit 96ad5b2

Please sign in to comment.