Skip to content

Commit 7aa62e3

Browse files
authored
Remove Node.js and Yarn from Docker containers (#649)
1 parent bd65462 commit 7aa62e3

File tree

4 files changed

+5
-25
lines changed

4 files changed

+5
-25
lines changed

Diff for: containers/docker/pwpush-ephemeral/Dockerfile

+1-6
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,8 @@ ENV PATH=${APP_ROOT}:${PATH} HOME=${APP_ROOT}
88

99
RUN apt-get update && apt-get install -y curl ca-certificates gnupg
1010

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-
1511
# 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
1713

1814
RUN mkdir -p ${APP_ROOT}
1915
ADD ./ ${APP_ROOT}/
@@ -31,7 +27,6 @@ RUN bundle config set without 'development production test'
3127
RUN bundle config set deployment 'true'
3228

3329
RUN bundle install
34-
RUN yarn install
3530
RUN bundle exec rails assets:precompile
3631
RUN bundle exec rake db:setup
3732

Diff for: containers/docker/pwpush-mysql/Dockerfile

+1-6
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,9 @@ ENV DATABASE_URL=mysql2://passwordpusher_user:passwordpusher_passwd@mysql:3306/p
99

1010
RUN apt-get update && apt-get install -y curl ca-certificates gnupg
1111

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-
1612
# Required packages
1713
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
1915

2016
RUN mkdir -p ${APP_ROOT}
2117
ADD ./ ${APP_ROOT}/
@@ -33,7 +29,6 @@ RUN bundle config set without 'development private test'
3329
RUN bundle config set deployment 'true'
3430

3531
RUN bundle install
36-
RUN yarn install
3732
RUN bundle exec rails assets:precompile
3833

3934
ENTRYPOINT ["containers/docker/pwpush-mysql/entrypoint.sh"]

Diff for: containers/docker/pwpush-openshift/Dockerfile

+2-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# pwpush-postgres
1+
# pwpush-openshift
22
FROM ruby:3-slim
33

44
LABEL maintainer='[email protected]'
@@ -9,12 +9,8 @@ ENV DATABASE_URL=postgresql://passwordpusher_user:passwordpusher_passwd@postgres
99

1010
RUN apt-get update && apt-get install -y curl ca-certificates gnupg
1111

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-
1612
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 && \
1814
cd /opt && \
1915
git clone https://github.com/pglombardo/PasswordPusher.git && \
2016
touch ${APP_ROOT}/log/production.log
@@ -32,7 +28,6 @@ RUN bundle config set without 'development private test'
3228
RUN bundle config set deployment 'true'
3329

3430
RUN bundle install
35-
RUN yarn install
3631
RUN bundle exec rails assets:precompile
3732

3833
ENTRYPOINT ["containers/docker/pwpush-postgres/entrypoint.sh"]

Diff for: containers/docker/pwpush-postgres/Dockerfile

+1-6
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,9 @@ ENV DATABASE_URL=postgres://passwordpusher_user:passwordpusher_passwd@postgres:5
99

1010
RUN apt-get update && apt-get install -y curl ca-certificates gnupg
1111

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-
1612
# Required packages
1713
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
1915

2016
RUN mkdir -p ${APP_ROOT}
2117
ADD ./ ${APP_ROOT}/
@@ -32,7 +28,6 @@ RUN bundle config set without 'development private test'
3228
RUN bundle config set deployment 'true'
3329

3430
RUN bundle install
35-
RUN yarn install
3631
RUN bundle exec rails assets:precompile
3732

3833
ENTRYPOINT ["containers/docker/pwpush-postgres/entrypoint.sh"]

0 commit comments

Comments
 (0)