From d3968bbea4ea93ab228ede4226e3f6b9955e3aff Mon Sep 17 00:00:00 2001 From: fspc Date: Sat, 25 Dec 2021 14:34:36 -0500 Subject: [PATCH] More bumbleberry workarounds, until bumbleberry:update is working properly. Former-commit-id: 349a641dfa63413b5a6e2e39769393ce0969e806 --- Dockerfile | 18 +----------------- bumbleberry-admin.tar.gz | 3 +++ bumbleberry-application.tar.gz | 3 +++ bumbleberry-css.tar.gz | 3 --- bumbleberry-web-fonts.tar.gz | 3 +++ 5 files changed, 10 insertions(+), 20 deletions(-) create mode 100644 bumbleberry-admin.tar.gz create mode 100644 bumbleberry-application.tar.gz delete mode 100644 bumbleberry-css.tar.gz create mode 100644 bumbleberry-web-fonts.tar.gz diff --git a/Dockerfile b/Dockerfile index 23f4071..1cbe6df 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,6 @@ FROM ruby:2.5 MAINTAINER Jonathan Rosenbaum -##RUN git clone https://github.com/fspc/BikeBikeBike.git /app/BikeBike COPY . /app/BikeBike RUN apt-get update && apt-get install -y nodejs postgresql-client @@ -14,24 +13,9 @@ RUN apt-get update && apt-get install -y nodejs postgresql-client # Note: phantomjs has been deprecated in favor of headless chrome WORKDIR /app/BikeBike -# COPY changes/Gemfile . -# Use DATABASE_URL env variable instead, although it takes precedence, regardless -# COPY database.yml ./config/database.yml RUN bundle install -RUN mkdir -p public/stylesheets/application -p public/stylesheets/web-fonts && tar xvfz bumbleberry-css.tar.gz -C public/stylesheets/application && tar xvfz bumbleberry-css.tar.gz -C public/stylesheets/web-fonts - -#RUN gem install json -v '1.8.6' -#RUN gem install activesupport -v '4.2.0' -#RUN gem install mini_portile2 -v '2.6.1' -#RUN gem install racc -v '1.6.0' -#RUN gem install actionview -v '4.2.0' - -# Gem::LoadError: You have already activated rake 12.3.3, but your Gemfile requires rake 11.1.2. Prepending `bundle exec` to your command may solve this. -# Do this with docker-compose -# RUN rake db:create -# RUN rake db:migrate - +RUN mkdir -p public/stylesheets/application -p public/stylesheets/web-fonts && tar xvfz bumbleberry-application.tar.gz -C public/stylesheets/application && tar xvfz bumbleberry-web-fonts.tar.gz -C public/stylesheets/web-fonts && tar xvfz bumbleberry-admin.tar.gz -C public/stylesheets/admin # Add a script to be executed every time the container starts. COPY entrypoint.sh /usr/bin/ diff --git a/bumbleberry-admin.tar.gz b/bumbleberry-admin.tar.gz new file mode 100644 index 0000000..5ad6037 --- /dev/null +++ b/bumbleberry-admin.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f459e4779ff1508eb14997481164942cb91f31dc58823bf3d0711ae4487208fc +size 2441820 diff --git a/bumbleberry-application.tar.gz b/bumbleberry-application.tar.gz new file mode 100644 index 0000000..ae346c9 --- /dev/null +++ b/bumbleberry-application.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6df4e15248450c1bdfe39efc891a038886344f60557ab6467651d3d0b63adc42 +size 6352360 diff --git a/bumbleberry-css.tar.gz b/bumbleberry-css.tar.gz deleted file mode 100644 index e715d8d..0000000 --- a/bumbleberry-css.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a35a36b336a9015ed0793d37ffd2caa6c2099b729b23b3b31467390f1e91635e -size 22906424 diff --git a/bumbleberry-web-fonts.tar.gz b/bumbleberry-web-fonts.tar.gz new file mode 100644 index 0000000..f9fd64a --- /dev/null +++ b/bumbleberry-web-fonts.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:78fdbd7839bd718cc5e9edcdd3d9a0216d9961ca0774ff20c57463e5d72e6c78 +size 47485755