Skip to content

Commit 3c2cec2

Browse files
committed
fixing ci test containers
1 parent 1a91e5d commit 3c2cec2

File tree

5 files changed

+45
-16
lines changed

5 files changed

+45
-16
lines changed

ci/Dockerfile.test_5_2_ruby_2_6

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM ruby:2.6-alpine3.12
33
RUN gem install bundler:2.1.4
44

55
RUN apk update --no-cache && \
6-
apk add build-base postgresql-dev git nodejs yarn tzdata bash sqlite-dev && \
6+
apk add build-base postgresql-dev git nodejs yarn tzdata bash sqlite-dev shared-mime-info npm && \
77
mkdir -p /app
88

99
WORKDIR /app
@@ -43,7 +43,14 @@ RUN mv _Gemfile Gemfile
4343
RUN mv _Gemfile.lock Gemfile.lock
4444
RUN mv _yarn.lock yarn.lock
4545

46-
RUN rm /app/spec/dummy/db/schema.rb
46+
WORKDIR /app/spec/dummy
4747

48-
RUN rm /app/spec/dummy/config/application.rb
49-
RUN mv /app/spec/dummy/config/application.5.2_rb /app/spec/dummy/config/application.rb
48+
RUN npm install
49+
RUN ./bin/webpack
50+
51+
RUN rm ./db/schema.rb
52+
53+
RUN rm ./config/application.rb
54+
RUN mv ./config/application.5.2_rb /app/spec/dummy/config/application.rb
55+
56+
WORKDIR /app

ci/Dockerfile.test_6_0_ruby_2_6

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM ruby:2.6-alpine3.12
33
RUN gem install bundler:2.1.4
44

55
RUN apk update --no-cache && \
6-
apk add build-base postgresql-dev git nodejs yarn tzdata bash sqlite-dev && \
6+
apk add build-base postgresql-dev git nodejs yarn tzdata bash sqlite-dev shared-mime-info npm && \
77
mkdir -p /app
88

99
WORKDIR /app
@@ -43,7 +43,14 @@ RUN mv _Gemfile Gemfile
4343
RUN mv _Gemfile.lock Gemfile.lock
4444
RUN mv _yarn.lock yarn.lock
4545

46-
RUN rm /app/spec/dummy/db/schema.rb
46+
WORKDIR /app/spec/dummy
4747

48-
RUN rm /app/spec/dummy/config/application.rb
49-
RUN mv /app/spec/dummy/config/application.6.0_rb /app/spec/dummy/config/application.rb
48+
RUN npm install
49+
RUN ./bin/webpack
50+
51+
RUN rm ./db/schema.rb
52+
53+
RUN rm ./config/application.rb
54+
RUN mv ./config/application.6.0_rb /app/spec/dummy/config/application.rb
55+
56+
WORKDIR /app

ci/Dockerfile.test_6_1_ruby_2_7

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM ruby:2.7-alpine3.12
33
RUN gem install bundler:2.1.4
44

55
RUN apk update --no-cache && \
6-
apk add build-base postgresql-dev git nodejs yarn tzdata bash sqlite-dev && \
6+
apk add build-base postgresql-dev git nodejs yarn tzdata bash sqlite-dev shared-mime-info npm && \
77
mkdir -p /app
88

99
WORKDIR /app
@@ -43,7 +43,14 @@ RUN mv _Gemfile Gemfile
4343
RUN mv _Gemfile.lock Gemfile.lock
4444
RUN mv _yarn.lock yarn.lock
4545

46-
RUN rm /app/spec/dummy/db/schema.rb
46+
WORKDIR /app/spec/dummy
4747

48-
RUN rm /app/spec/dummy/config/application.rb
49-
RUN mv /app/spec/dummy/config/application.6.1_rb /app/spec/dummy/config/application.rb
48+
RUN npm install
49+
RUN ./bin/webpack
50+
51+
RUN rm ./db/schema.rb
52+
53+
RUN rm ./config/application.rb
54+
RUN mv ./config/application.6.1_rb /app/spec/dummy/config/application.rb
55+
56+
WORKDIR /app

ci/Dockerfile.test_6_1_ruby_3_0

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM ruby:3.0-alpine3.12
33
RUN gem install bundler:2.1.4
44

55
RUN apk update --no-cache && \
6-
apk add build-base postgresql-dev git nodejs yarn tzdata bash sqlite-dev && \
6+
apk add build-base postgresql-dev git nodejs yarn tzdata bash sqlite-dev shared-mime-info npm && \
77
mkdir -p /app
88

99
WORKDIR /app
@@ -43,8 +43,14 @@ RUN mv _Gemfile Gemfile
4343
RUN mv _Gemfile.lock Gemfile.lock
4444
RUN mv _yarn.lock yarn.lock
4545

46+
WORKDIR /app/spec/dummy
4647

47-
RUN rm /app/spec/dummy/db/schema.rb
48+
RUN npm install
49+
RUN ./bin/webpack
4850

49-
RUN rm /app/spec/dummy/config/application.rb
50-
RUN mv /app/spec/dummy/config/application.6.1_rb /app/spec/dummy/config/application.rb
51+
RUN rm ./db/schema.rb
52+
53+
RUN rm ./config/application.rb
54+
RUN mv ./config/application.6.1_rb /app/spec/dummy/config/application.rb
55+
56+
WORKDIR /app

ci/docker-compose.ci.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ services:
3333
dockerfile: ./ci/Dockerfile.test_6_1_ruby_2_7
3434
environment:
3535
RAILS_ENV: test
36+
ports:
37+
- "33123:33123"
3638
volumes:
3739
- "../ci/artifacts:/app/ci/artifacts"
3840
links:

0 commit comments

Comments
 (0)