Skip to content

Commit f41c5cc

Browse files
authored
Hotfix/fix dockerfile (#81)
* fix dockerfile gem install and CI * remove gemlock * recover gemfile lock * add empty line
1 parent af0e5b4 commit f41c5cc

File tree

2 files changed

+7
-18
lines changed

2 files changed

+7
-18
lines changed

.circleci/config.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ jobs:
55
steps:
66
- checkout
77
- restore_cache:
8-
key: docker-{{ checksum ".circleci/config.yml" }}-{{ checksum "docker-compose.system-test.yml" }}-{{ checksum "Dockerfile.system-test" }}-{{ checksum "bucky-core.gemspec" }}-{{ checksum ".dockerignore" }}-{{ checksum "Gemfile.lock" }}
8+
key: docker-{{ checksum ".circleci/config.yml" }}-{{ checksum "docker-compose.system-test.yml" }}-{{ checksum "Dockerfile.system-test" }}-{{ checksum "bucky-core.gemspec" }}-{{ checksum ".dockerignore" }}
99
- run:
1010
command: |
1111
if [ ! -f ~/caches/images.tar ]; then
@@ -14,15 +14,15 @@ jobs:
1414
docker save $(docker images | awk 'NR>=2 && ! /^<none>/{print $1}') -o ~/caches/images.tar
1515
fi
1616
- save_cache:
17-
key: docker-{{ checksum ".circleci/config.yml" }}-{{ checksum "docker-compose.system-test.yml" }}-{{ checksum "Dockerfile.system-test" }}-{{ checksum "bucky-core.gemspec" }}-{{ checksum ".dockerignore" }}-{{ checksum "Gemfile.lock" }}
17+
key: docker-{{ checksum ".circleci/config.yml" }}-{{ checksum "docker-compose.system-test.yml" }}-{{ checksum "Dockerfile.system-test" }}-{{ checksum "bucky-core.gemspec" }}-{{ checksum ".dockerignore" }}
1818
paths: ~/caches/images.tar
1919
system_test:
2020
machine: true
2121
parallelism: 2
2222
steps:
2323
- checkout
2424
- restore_cache:
25-
key: docker-{{ checksum ".circleci/config.yml" }}-{{ checksum "docker-compose.system-test.yml" }}-{{ checksum "Dockerfile.system-test" }}-{{ checksum "bucky-core.gemspec" }}-{{ checksum ".dockerignore" }}-{{ checksum "Gemfile.lock" }}
25+
key: docker-{{ checksum ".circleci/config.yml" }}-{{ checksum "docker-compose.system-test.yml" }}-{{ checksum "Dockerfile.system-test" }}-{{ checksum "bucky-core.gemspec" }}-{{ checksum ".dockerignore" }}
2626
- run:
2727
command: docker load -q -i ~/caches/images.tar
2828
- run:
@@ -130,4 +130,6 @@ workflows:
130130
tags:
131131
only: /^v[0-9]{1,}(\.[0-9]{1,}){2}$/
132132
branches:
133-
ignore: /.*/
133+
ignore: /.*/
134+
requires:
135+
- publish_to_rubygems

Dockerfile

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,7 @@ RUN apk update && \
2121
yaml-dev \
2222
zlib-dev
2323

24-
ENV BC_DIR /bucky-core/
25-
ENV PATH /bucky-core/exe/:$PATH
26-
WORKDIR $BC_DIR
27-
COPY . $BC_DIR
28-
29-
RUN \
30-
gem install bundler -v 1.17.3 && \
31-
echo 'gem: --no-document' >> ~/.gemrc && \
32-
cp ~/.gemrc /etc/gemrc && \
33-
chmod uog+r /etc/gemrc && \
34-
bundle config --global build.nokogiri --use-system-libraries && \
35-
bundle config --global jobs 4 && \
36-
bundle install && \
37-
rm -rf ~/.gem
24+
RUN gem install bucky-core
3825

3926
WORKDIR /app
4027
RUN chown -R nobody:nobody /app

0 commit comments

Comments
 (0)