Skip to content

Commit

Permalink
Cleanup curl-dev used at build time
Browse files Browse the repository at this point in the history
  • Loading branch information
h0tbird committed Jul 8, 2016
1 parent bce25b5 commit fe4f5d8
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 10 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ ENV PORTUS_VERSION="master" \
# Install:
#------------------------------------------------------------------------------

RUN apk --no-cache add --update -t deps git gcc make musl-dev \
libxml2-dev libxslt-dev mariadb-dev openssl-dev libffi-dev \
RUN apk --no-cache add --update -t deps 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 nodejs tzdata libxslt \
mariadb-libs mariadb-client openssl ruby-io-console ruby-bigdecimal \
mariadb-client-libs curl-dev libcurl \
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 \
Expand Down
10 changes: 4 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,11 @@ cd portus && docker run -it --rm \
--env PORTUS_DELETE_ENABLED=true \
--env PORTUS_SECRET_KEY_BASE=$(openssl rand -hex 64) \
--env PORTUS_ENCRYPTION_PRIVATE_KEY_PATH=/certs/server-key.pem \
--env PORTUS_PORTUS_PASSWORD=$(openssl rand -hex 64) \
h0tbird/portus:v2.0.5-3
--env PORTUS_PORTUS_PASSWORD=some-password \
h0tbird/portus:v2.0.5-4
```

Browse to https://127.0.0.1 and setup the `portus` user with the password provided in `PORTUS_PORTUS_PASSWORD`.
Do not fill the *New Registry* form until you have actually started the registry in step 4.
Browse to https://127.0.0.1 and setup the `portus` user with the same password provided in the environment variable `PORTUS_PORTUS_PASSWORD`. Do not fill the *New Registry* form until you have actually started the registry in step 4.

##### 4. Registry:

Expand Down Expand Up @@ -129,8 +128,7 @@ curl -s http://127.0.0.1:5001/debug/health | jq '.'
curl -s http://127.0.0.1:5001/debug/vars | jq '.'
```

Now you can fill the *New Registry* form. Use `127.0.0.1:5000` for the hostname and check the SSL checkbox.
At this point you are logged in as `portus` user. You won't be able to use that user again so create your own admin user before you logout.
Now you can fill the *New Registry* form. Use `127.0.0.1:5000` for the hostname and check the SSL checkbox. At this point you are logged in as `portus` user. You won't be able to use that user again so create your own admin user before you logout.

##### 5. Docker:
```
Expand Down
2 changes: 1 addition & 1 deletion marathon.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"container": {
"type": "DOCKER",
"docker": {
"image": "h0tbird/portus:v2.0.5-3",
"image": "h0tbird/portus:v2.0.5-4",
"network": "BRIDGE",
"portMappings": [
{ "containerPort": 443, "hostPort": 0 }
Expand Down

0 comments on commit fe4f5d8

Please sign in to comment.