Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
1f90c30
Add superadmin setting to users and protect site settings page
em-cd Oct 10, 2022
db12581
Test that only superadmins can view site settings
em-cd Nov 2, 2022
7cef1a2
Add test for updating site settings
em-cd Nov 2, 2022
e874f92
Adds support to generate HTML version of code coverage report for
em-cd Nov 2, 2022
03871d3
Docker environment for Outpost
apricot13 Mar 10, 2023
6ca3b75
Revert "Docker environment for Outpost" for some reason tower pushed …
apricot13 Mar 10, 2023
b701cf8
updating images
apricot13 Apr 27, 2023
21909e7
Merge pull request #285 from wearefuturegov/feature/update-readme-images
apricot13 Aug 20, 2023
bc708f5
Merge remote-tracking branch 'origin/feature/generate-html-coverage-r…
apricot13 Aug 23, 2023
72594c6
Merge remote-tracking branch 'origin/protect-site-settings-page' into…
apricot13 Aug 23, 2023
a7ccb23
Docker container
apricot13 Aug 25, 2023
4d9578d
Publish image to github container registry
apricot13 Aug 25, 2023
ee82ae4
need default username and password
apricot13 Aug 25, 2023
44b783c
test env vars
apricot13 Aug 25, 2023
89f4e7c
fix for precompile error in tests
apricot13 Aug 25, 2023
42a0a2a
Publish Docker image
apricot13 Aug 25, 2023
5231723
Update documentation
apricot13 Aug 25, 2023
18ef50e
build and run the image
apricot13 Aug 25, 2023
27f2872
tweak to seed data and docker compose setup for dev
apricot13 Aug 25, 2023
c73d3df
Update dockerfile to prevent permission errors but still run as USER
apricot13 Sep 22, 2023
faacac7
Update to the scss to make themeing more robust
apricot13 Sep 22, 2023
38e8170
Update readme and env vars
apricot13 Sep 25, 2023
de6c86d
Adds a wysiwyg editor to the description field for services
apricot13 Sep 25, 2023
04e737e
Remove quotes as an option
apricot13 Sep 26, 2023
ba170ce
Add custom form builder for wysiwyg fields
apricot13 Sep 26, 2023
c4c0eaf
Add in custom body classes and feature_wysiwyg flag
apricot13 Sep 26, 2023
5093568
Remove strikethrough
apricot13 Sep 29, 2023
9842d0f
Adding postgresql-client to docker container
apricot13 Oct 19, 2023
52b3f5f
only build when pushing to feature/develop
apricot13 Nov 29, 2023
3ccc7b3
only commit when pushing to feature/develop
apricot13 Nov 29, 2023
9858f6d
Merge pull request #287 from wearefuturegov/feature/rails-6-container…
apricot13 Nov 29, 2023
8598e44
Merge pull request #288 from wearefuturegov/feature/fix-settings-scss
apricot13 Nov 29, 2023
5bceee8
Merge pull request #289 from wearefuturegov/feature/rich-text-descrip…
apricot13 Nov 29, 2023
21fca3b
Merge pull request #290 from wearefuturegov/feature/add-postgres-client
apricot13 Nov 29, 2023
4dd6ef9
fix syntax error
apricot13 Nov 29, 2023
3af92d6
Merge pull request #292 from wearefuturegov/feature/fix-image-build-l…
apricot13 Nov 29, 2023
364b633
Update favicon
apricot13 Nov 29, 2023
56008c9
Merge pull request #293 from wearefuturegov/feature/update-favicon
apricot13 Nov 29, 2023
2d409df
Small fix to the full width layout page erroring
apricot13 Jan 12, 2024
6fd3e00
Merge pull request #294 from wearefuturegov/feature/full-width
apricot13 Jan 12, 2024
aff2a91
possible fix for trix editors being wrong on load
apricot13 Feb 13, 2024
21f908a
Remove tags for service description before previewing it in popup
apricot13 Feb 13, 2024
406e222
Merge pull request #296 from wearefuturegov/feature/wysiwyg-and-rich-…
apricot13 Feb 13, 2024
24418f1
Update yarn, node, bundler versions to match latest heroku-20
apricot13 Feb 13, 2024
33f16c9
Enable testing on heroku
apricot13 Feb 19, 2024
7b92ed2
update github tests
apricot13 Feb 20, 2024
8bfd873
review apps
apricot13 Feb 20, 2024
81ee706
Merge pull request #297 from wearefuturegov/feature/heroku-20-updates
apricot13 Feb 20, 2024
33315af
Merge pull request #291 from wearefuturegov/feature/develop
apricot13 Feb 20, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
98 changes: 98 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
Procfile
makefile

# git
.git
.gitattributes
.gitignore
.github

# docker
docker-compose.yml
docker-compose.*
Dockerfile
.dockerignore
# environment/

# environment and secretsss
.env
# Comment out this rule if you are OK with secrets being uploaded to the repo
config/initializers/secret_token.rb
config/master.key

# Only include if you have production secrets in this file, which is no longer a Rails default
config/secrets.yml
/lib/seeds/*

# Ignore uploaded files in development
/storage/*
!/storage/.keep

# Common
README.md
CHANGELOG.md

# logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
/log/*
!/log/.keep

# tmp
/tmp/*
!/tmp/.keep
*.swp
*~
.DS_Store

# Dependencies and dependency managers
node_modules/
# Ignore yarn files
/yarn-error.log
yarn-debug.log*
.yarn-integrity
/bundle/
/.bundle
/vendor/bundle
# these should all be checked in to normalize the environment:
# Gemfile.lock, .ruby-version, .ruby-gemset

# ides
.idea
.vscode

# ruby
# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
.rvmrc
*.gem
/.config
/InstalledFiles
/pkg/
/spec/reports/
/spec/examples.txt
/test/tmp/
/test/version_tmp/
/tmp/

# Ignore Byebug command history file.
.byebug_history

# rails
*.rbc
capybara-*.html
.rspec
/db/*.sqlite3
/db/*.sqlite3-journal
/public/system
/coverage/
/spec/tmp
rerun.txt
pickle-email-*.html

# Ignore precompiled javascript packs
/public/packs
/public/packs-test
/public/assets
53 changes: 0 additions & 53 deletions .env.example

This file was deleted.

26 changes: 26 additions & 0 deletions .github/workflows/ghcr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Deploy Images to GHCR

on:
push:
branches:
- feature/develop
workflow_dispatch:

jobs:
push-store-image:
runs-on: ubuntu-latest
steps:
- name: "Checkout GitHub Action"
uses: actions/checkout@main

- name: "Login to GitHub Container Registry"
uses: docker/login-action@v1
with:
registry: ghcr.io
username: ${{github.actor}}
password: ${{secrets.GITHUB_TOKEN}}

- name: "Build Inventory Image"
run: |
docker build . --tag ghcr.io/wearefuturegov/outpost:latest
docker push ghcr.io/wearefuturegov/outpost:latest
15 changes: 12 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@

name: Run tests

env:
RAILS_ENV: test
NODE_ENV: development

on: [push]

jobs:
Expand All @@ -11,7 +15,7 @@ jobs:

services:
postgres:
image: postgres:11.7-alpine
image: postgres:13.7-alpine
env:
POSTGRES_USER: outpost
POSTGRES_PASSWORD: password
Expand All @@ -20,7 +24,7 @@ jobs:
- 5432:5432
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
mongo:
image: mongo
image: mongo:6
env:
MONGO_INITDB_ROOT_USERNAME: root
MONGO_INITDB_ROOT_PASSWORD: password
Expand All @@ -43,7 +47,7 @@ jobs:
- name: Install required Node.js version
uses: actions/setup-node@v2
with:
node-version: 14
node-version: 20.9.0

- name: Get Yarn cache directory path
id: yarn-cache
Expand All @@ -56,11 +60,14 @@ jobs:
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}

- name: Yarn install
env:
NODE_OPTIONS: --openssl-legacy-provider
run: yarn --frozen-lockfile

- name: Setup database
env:
RAILS_ENV: test
DATABASE_URL: postgresql://outpost:password@localhost:5432/outpost_test
DB_URI: mongodb://root:password@localhost:27017/outpost_development?authSource=admin
run: |
bundle exec rails db:drop
Expand All @@ -70,6 +77,7 @@ jobs:
- name: Compile assets
env:
RAILS_ENV: test
NODE_OPTIONS: --openssl-legacy-provider
run: |
bundle exec rails assets:precompile

Expand All @@ -78,6 +86,7 @@ jobs:
RAILS_ENV: test
GOOGLE_API_KEY: ${{ secrets.GOOGLE_API_KEY }}
OFSTED_FEED_API_ENDPOINT: https://test-ofsted-feed.stub # this is not a real url, we just need an env variable set for the stub to work in tests
DATABASE_URL: postgresql://outpost:password@localhost:5432/outpost_test
run: |
bundle exec rspec

Expand Down
6 changes: 4 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,7 @@ yarn-debug.log*
/coverage

.DS_Store
yarn.lock
.vscode
.vscode
.env*

/config/credentials/production.key
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
lts/*
20.9.0
Loading