File tree 4 files changed +5
-25
lines changed
4 files changed +5
-25
lines changed Original file line number Diff line number Diff line change @@ -8,12 +8,8 @@ ENV PATH=${APP_ROOT}:${PATH} HOME=${APP_ROOT}
8
8
9
9
RUN apt-get update && apt-get install -y curl ca-certificates gnupg
10
10
11
- # Required to get the Node.js yarn tool
12
- RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
13
- RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
14
-
15
11
# Required packages
16
- RUN apt-get update && apt-get install -qq -y --assume-yes build-essential apt-utils libpq-dev git curl tzdata libsqlite3-0 libsqlite3-dev zlib1g-dev nodejs yarn
12
+ RUN apt-get update && apt-get install -qq -y --assume-yes build-essential apt-utils libpq-dev git curl tzdata libsqlite3-0 libsqlite3-dev zlib1g-dev
17
13
18
14
RUN mkdir -p ${APP_ROOT}
19
15
ADD ./ ${APP_ROOT}/
@@ -31,7 +27,6 @@ RUN bundle config set without 'development production test'
31
27
RUN bundle config set deployment 'true'
32
28
33
29
RUN bundle install
34
- RUN yarn install
35
30
RUN bundle exec rails assets:precompile
36
31
RUN bundle exec rake db:setup
37
32
Original file line number Diff line number Diff line change @@ -9,13 +9,9 @@ ENV DATABASE_URL=mysql2://passwordpusher_user:passwordpusher_passwd@mysql:3306/p
9
9
10
10
RUN apt-get update && apt-get install -y curl ca-certificates gnupg
11
11
12
- # Required to get the Node.js yarn tool
13
- RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
14
- RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
15
-
16
12
# Required packages
17
13
RUN apt-get update -qq && \
18
- apt-get install -qq -y --assume-yes build-essential apt-utils git curl tzdata zlib1g-dev nodejs yarn default-libmysqlclient-dev
14
+ apt-get install -qq -y --assume-yes build-essential apt-utils git curl tzdata zlib1g-dev default-libmysqlclient-dev
19
15
20
16
RUN mkdir -p ${APP_ROOT}
21
17
ADD ./ ${APP_ROOT}/
@@ -33,7 +29,6 @@ RUN bundle config set without 'development private test'
33
29
RUN bundle config set deployment 'true'
34
30
35
31
RUN bundle install
36
- RUN yarn install
37
32
RUN bundle exec rails assets:precompile
38
33
39
34
ENTRYPOINT ["containers/docker/pwpush-mysql/entrypoint.sh" ]
Original file line number Diff line number Diff line change 1
- # pwpush-postgres
1
+ # pwpush-openshift
2
2
FROM ruby:3-slim
3
3
4
4
LABEL maintainer=
'[email protected] '
@@ -9,12 +9,8 @@ ENV DATABASE_URL=postgresql://passwordpusher_user:passwordpusher_passwd@postgres
9
9
10
10
RUN apt-get update && apt-get install -y curl ca-certificates gnupg
11
11
12
- # Required to get the Node.js yarn tool
13
- RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
14
- RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
15
-
16
12
RUN apt-get update -qq && \
17
- apt-get install -qq -y --assume-yes build-essential apt-utils libpq-dev git curl tzdata libsqlite3-0 libsqlite3-dev zlib1g-dev nodejs yarn && \
13
+ apt-get install -qq -y --assume-yes build-essential apt-utils libpq-dev git curl tzdata libsqlite3-0 libsqlite3-dev zlib1g-dev && \
18
14
cd /opt && \
19
15
git clone https://github.com/pglombardo/PasswordPusher.git && \
20
16
touch ${APP_ROOT}/log/production.log
@@ -32,7 +28,6 @@ RUN bundle config set without 'development private test'
32
28
RUN bundle config set deployment 'true'
33
29
34
30
RUN bundle install
35
- RUN yarn install
36
31
RUN bundle exec rails assets:precompile
37
32
38
33
ENTRYPOINT ["containers/docker/pwpush-postgres/entrypoint.sh" ]
Original file line number Diff line number Diff line change @@ -9,13 +9,9 @@ ENV DATABASE_URL=postgres://passwordpusher_user:passwordpusher_passwd@postgres:5
9
9
10
10
RUN apt-get update && apt-get install -y curl ca-certificates gnupg
11
11
12
- # Required to get the Node.js yarn tool
13
- RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
14
- RUN echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
15
-
16
12
# Required packages
17
13
RUN apt-get update -qq && \
18
- apt-get install -qq -y --assume-yes build-essential apt-utils libpq-dev git curl tzdata zlib1g-dev nodejs yarn
14
+ apt-get install -qq -y --assume-yes build-essential apt-utils libpq-dev git curl tzdata zlib1g-dev
19
15
20
16
RUN mkdir -p ${APP_ROOT}
21
17
ADD ./ ${APP_ROOT}/
@@ -32,7 +28,6 @@ RUN bundle config set without 'development private test'
32
28
RUN bundle config set deployment 'true'
33
29
34
30
RUN bundle install
35
- RUN yarn install
36
31
RUN bundle exec rails assets:precompile
37
32
38
33
ENTRYPOINT ["containers/docker/pwpush-postgres/entrypoint.sh" ]
You can’t perform that action at this time.
0 commit comments