Skip to content
This repository was archived by the owner on Jun 29, 2019. It is now read-only.

Commit d191c3d

Browse files
committed
more renaming
1 parent 474002d commit d191c3d

5 files changed

+40
-5
lines changed

Dockerfile renamed to Dockerfile.tester

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
FROM ruby:2.3-slim
2-
RUN apt-get -y update
2+
RUN apt-get update
33
RUN apt-get -y install build-essential
44

55
# mysql
@@ -17,10 +17,10 @@ RUN apt-get -y install mongodb-clients
1717
WORKDIR /opt/uphold
1818
COPY Gemfile /opt/uphold/Gemfile
1919
COPY Gemfile.lock /opt/uphold/Gemfile.lock
20-
RUN bundle install
20+
RUN bundle install --without ui development
2121
ADD . /opt/uphold
2222

2323
# this to just check the docker mounts works in development
2424
RUN rm -rf dev
2525

26-
ENTRYPOINT ["ruby", "environment.rb"]
26+
ENTRYPOINT ["ruby", "tester.rb"]

Dockerfile.ui

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
FROM ruby:2.3-slim
2+
3+
RUN apt-get update
4+
RUN apt-get -y install build-essential
5+
RUN apt-get -y install sqlite3 libsqlite3-dev
6+
7+
WORKDIR /opt/uphold
8+
COPY Gemfile /opt/uphold/Gemfile
9+
COPY Gemfile.lock /opt/uphold/Gemfile.lock
10+
RUN bundle install --without tester development
11+
ADD . /opt/uphold
12+
13+
# this to just check the docker mounts works in development
14+
RUN rm -rf dev
15+
16+
EXPOSE 80
17+
CMD ["bundle", "exec", "rackup", "config.ru", "-p", "80", "-s", "thin", "-o", "0.0.0.0"]

build_and_inspect_ui

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/bash
2+
3+
docker build --tag="uphold-ui:dockerfile" --file="Dockerfile.ui" .
4+
docker run \
5+
-it \
6+
--entrypoint=/bin/bash \
7+
-v /var/run/docker.sock:/var/run/docker.sock \
8+
-v `pwd`/dev/uphold.yml:/etc/uphold/uphold.yml \
9+
uphold-ui:dockerfile

build_and_run renamed to build_and_run_tester

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
docker build -t "uphold:dockerfile" .
3+
docker build --tag="uphold-tester:dockerfile" --file=Dockerfile.tester .
44
docker run \
55
-it \
66
-v /var/run/docker.sock:/var/run/docker.sock \
@@ -10,7 +10,7 @@ docker run \
1010
-v `pwd`/dev/blobs:/var/backups \
1111
-v `pwd`/dev/custom/engines:/etc/uphold/engines \
1212
-v `pwd`/dev/custom/transports:/etc/uphold/transports \
13-
uphold:dockerfile \
13+
uphold-tester:dockerfile \
1414
development.yml
1515

1616
if [ $? -eq 0 ]; then

build_and_run_ui

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/bash
2+
3+
docker build --tag="uphold-ui:dockerfile" --file=Dockerfile.ui .
4+
docker run \
5+
-it \
6+
-p 80:80 \
7+
-v /var/run/docker.sock:/var/run/docker.sock \
8+
-v `pwd`/dev/uphold.yml:/etc/uphold/uphold.yml \
9+
uphold-ui:dockerfile

0 commit comments

Comments
 (0)