Skip to content

Commit

Permalink
Update to Alpine 3.4
Browse files Browse the repository at this point in the history
  • Loading branch information
h0tbird committed Jun 3, 2016
1 parent cd86f75 commit e042280
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 7 deletions.
8 changes: 5 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Set the base image for subsequent instructions:
#------------------------------------------------------------------------------

FROM alpine:3.3
FROM alpine:3.4
MAINTAINER Marc Villacorta Morera <[email protected]>

#------------------------------------------------------------------------------
Expand All @@ -16,15 +16,17 @@ ENV PORTUS_VERSION="master" \
# Install:
#------------------------------------------------------------------------------

RUN apk --no-cache add --update -t deps git ruby-mini_portile gcc make \
musl-dev libxml2-dev libxslt-dev mariadb-dev openssl-dev \
RUN apk --no-cache add --update -t deps git gcc make musl-dev \
libxml2-dev libxslt-dev mariadb-dev openssl-dev libffi-dev \
&& 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 curl-dev \
&& 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 \
&& bundle install --retry=3 \
&& apk del --purge deps; rm -rf /tmp/* /var/cache/apk/*

Expand Down
12 changes: 8 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,14 @@ docker run -it --rm \
--env MYSQL_DATABASE=portus \
mariadb:10
```
Note that PUMA_IP is to be used if you want to have the registry and portus running on the same port but on different addresses, for example:

##### 3. Portus:

Note that `PUMA_IP` is to be used if you want to have the registry and portus running on the same port but on different addresses, for example:

- Portus -> 10.0.0.1:443
- Registry -> 10.0.0.2:443

##### 3. Portus:
```
cd portus && docker run -it --rm \
--net host --name portus \
Expand All @@ -87,9 +90,10 @@ cd portus && docker run -it --rm \
h0tbird/portus:latest
```

##### 4. Registry:

Make sure any endpoint defined in `SSL_TRUST` is up and running before starting the registry.

##### 4. Registry:
```
cd portus && docker run -it --rm \
--net host --name registry \
Expand All @@ -109,7 +113,7 @@ cd portus && docker run -it --rm \
--env ENDPOINT_TIMEOUT=500 \
--env ENDPOINT_THRESHOLD=5 \
--env ENDPOINT_BACKOFF=1 \
h0tbird/registry:v2.3.0-2
h0tbird/registry:v2.4.1-1
```

##### 5. Docker:
Expand Down

0 comments on commit e042280

Please sign in to comment.