Skip to content

Commit 2b5d1f3

Browse files
committed
build: Update dev setup
1 parent 9aa9a51 commit 2b5d1f3

File tree

6 files changed

+11
-33
lines changed

6 files changed

+11
-33
lines changed

.dockerignore

Lines changed: 0 additions & 15 deletions
This file was deleted.

extra/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ENV DEVEL=1
66
ENV LANG=C.UTF-8
77

88
RUN apt-get update -qq
9-
RUN apt-get install -yqq --no-install-recommends build-essential chromium libyaml-dev nano netcat-traditional pkg-config
9+
RUN apt-get install -yqq --no-install-recommends build-essential chromium less libyaml-dev nano netcat-traditional pkg-config
1010

1111
ARG BUNDLER_VERSION
1212
RUN gem install bundler -v ${BUNDLER_VERSION}
@@ -26,6 +26,6 @@ ENV ACTIVEADMIN_VERSION=$ACTIVEADMIN_VERSION
2626
WORKDIR /app
2727
COPY . /app
2828
RUN bundle install
29-
RUN chown -R app:app /app/spec/dummy/db /usr/local/bundle
29+
RUN mkdir -p /app/spec/dummy/db && chown -R app:app /app/spec/dummy/db /usr/local/bundle
3030

3131
RUN ln -s /app/extra/.bashrc /home/app/.bashrc

extra/Dockerfile.dockerignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Ignore everything but the required files for bundle install
2+
/**/*
3+
4+
!/*.gemspec
5+
!/Gemfile
6+
!/lib

extra/dev_setup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
export DEVEL=1
44

5-
export RAILS_VERSION=8.0.2
5+
export RAILS_VERSION=7.2.2.1
66
export ACTIVEADMIN_VERSION=3.3.0
77

88
export RAILS_ENV=development

extra/development.md

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
### Dev setup
44

5-
There 3 ways to interact with this project:
5+
There 2 ways to interact with this project:
66

77
1) Using Docker:
88

@@ -24,19 +24,7 @@ RUBY=3.2 RAILS=7.1.0 ACTIVEADMIN=3.2.0 make up
2424
# For more commands please check the Makefile
2525
```
2626

27-
2) Using Appraisal:
28-
29-
```sh
30-
export RAILS_ENV=development
31-
# Install dependencies:
32-
bin/appraisal
33-
# Run server (or any command):
34-
bin/appraisal rails s
35-
# Or with a specific configuration:
36-
bin/appraisal rails80-activeadmin rails s
37-
```
38-
39-
3) With a local setup:
27+
2) With a local setup:
4028

4129
```sh
4230
# Dev setup (set the required envs):

extra/docker-compose.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,3 @@ services:
1717
- ..:/app
1818
stdin_open: true
1919
tty: true
20-
command: ${COMMAND:-extra/init.sh}

0 commit comments

Comments
 (0)