Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
975 commits
Select commit Hold shift + click to select a range
a256ae1
Merge pull request #152 from KislakCenter/development
Aug 3, 2021
923d45c
fix link, split paragraph, open links in new tab
body-clock Aug 3, 2021
c88d38f
Merge pull request #153 from KislakCenter/fix/paragraph-split
body-clock Aug 3, 2021
ff92e70
chance cancel to close
body-clock Aug 5, 2021
e03978e
Merge pull request #154 from KislakCenter/fix/paragraph-split
body-clock Aug 5, 2021
ce9a994
fix subgroup sewing crash
body-clock Aug 5, 2021
033d834
Merge pull request #156 from KislakCenter/fix/155-delete-sewing
body-clock Aug 5, 2021
63b77b1
remove log statement
body-clock Aug 5, 2021
c7dcc53
bump version 0.11.3
body-clock Aug 6, 2021
ba25769
Merge pull request #157 from KislakCenter/development
Aug 6, 2021
610783c
always show user icon, change it to svg, and add hover text
body-clock Aug 10, 2021
68dada1
bump version
body-clock Aug 10, 2021
e74266f
Merge pull request #159 from KislakCenter/fix/158-missing-user-icon
body-clock Aug 10, 2021
f18c51f
Merge pull request #160 from KislakCenter/development
body-clock Aug 10, 2021
39f0d6f
Add gitleaks config
emeryr-upenn Aug 10, 2021
b1dacb2
Gitleaks ignore: resetPasswordRequest
emeryr-upenn Aug 10, 2021
964e4e9
Add additional gitleaks exceptions
emeryr-upenn Aug 11, 2021
2fe71ae
Merge branch 'add-gitleaks-config' into 'development'
emeryr-upenn Aug 11, 2021
035a8fc
Add .gitlab-ci.yml
emeryr-upenn Aug 11, 2021
3afef25
bump version for gitlab test
body-clock Aug 12, 2021
b0f0891
Create separate images for web and idrovora
lts-andrewnk Aug 13, 2021
7aaac63
Trigger build
lts-andrewnk Aug 13, 2021
6f67c3b
Merge branch 'feature/multiple_registry_images' into 'development'
emeryr-upenn Aug 13, 2021
a287711
bump version 0.11.6
body-clock Aug 16, 2021
0855ab9
Merge branch 'development' of https://gitlab.library.upenn.edu/kislak…
body-clock Aug 16, 2021
16d6b74
Merge branch 'development' into 'master'
emeryr-upenn Aug 16, 2021
d081283
close feedback dialog on submit
body-clock Aug 18, 2021
6a43922
Merge branch 'fix/159-feedback-form-close' into 'development'
Aug 19, 2021
52107ff
update tips
body-clock Aug 19, 2021
3a13802
bump version 0.11.7
body-clock Aug 19, 2021
03af1f0
Merge branch 'fix/160-update-tips' into 'development'
Aug 19, 2021
4636d49
Remove extra old RNG file
emeryr-upenn Aug 23, 2021
9ab15c8
Update RNG to latest VisColl
emeryr-upenn Aug 23, 2021
3d366e1
add label to parchment sides taxonomy
body-clock Aug 24, 2021
919c14d
add label to terms taxonomy
body-clock Aug 24, 2021
3d0a9ef
add label to term elements in taxonomy element
body-clock Aug 24, 2021
9699ce6
insert version into xported xml
body-clock Aug 24, 2021
d3f9ddb
bump version 0.11.8
body-clock Aug 31, 2021
1133993
Merge branch 'feature/161-insert-viscoll-version-into-output-xml' int…
Aug 31, 2021
dab89e3
Merge branch 'development' into 'master'
Aug 31, 2021
4738bf5
add help link
body-clock Sep 8, 2021
a92a9c6
Merge branch 'feature/162-help-link' into 'development'
Sep 8, 2021
94bd80e
bump version 0.11.9
body-clock Sep 14, 2021
f305ca5
Merge branch 'development' into 'master'
Sep 15, 2021
8cf74c5
sort imageBacklog array by label
body-clock Sep 15, 2021
ee260b1
Merge branch 'fix/163-order-uploaded-images' into 'development'
Sep 15, 2021
10df96c
Merge branch 'development' into 'master'
Sep 15, 2021
2b215b1
fix email templates
body-clock Sep 16, 2021
6124afb
fix break tag
body-clock Sep 16, 2021
ee3f50d
Merge branch 'fix/164-feedback-email-format' into 'development'
Sep 16, 2021
d0dcf4b
bump version 0.11.10
body-clock Sep 16, 2021
ce66ece
Merge branch 'development' into 'master'
Sep 16, 2021
a7ccff9
WIP: supporting IIIF 3
body-clock Oct 15, 2021
48b7bbf
bump openseadragon to latest version
body-clock Oct 18, 2021
7f9ef31
bump prefixurl osd to 2.4.2
body-clock Oct 18, 2021
992c759
remove pry statement
body-clock Oct 18, 2021
9858fe9
basic and fragile IIIF 3 functionality - this is messy
body-clock Oct 18, 2021
5a9f623
determine version from IIIF context instead of manifest URL, clean up…
body-clock Oct 19, 2021
bbaf370
format
body-clock Oct 19, 2021
4bf02ca
refactor info.json URL generation
body-clock Oct 19, 2021
060aa77
refactor addTiles method to use new getInfoUrl method
body-clock Oct 19, 2021
7457fb8
getInfoURL method capitalization
body-clock Oct 19, 2021
f8d9a8c
fix length of folio input in leafinfobox
body-clock Oct 19, 2021
3f52240
fix folio_number in viewing mode (shareable URL(
body-clock Oct 20, 2021
852b051
bump version 0.12.0
body-clock Oct 20, 2021
a8ba5f5
Merge branch 'fix/165-unparseable-iiif-manifest' into 'development'
Oct 20, 2021
abede53
fix attachment of new term: ensure ID has 'Term_' in front of it when…
body-clock Oct 20, 2021
2f0e84f
bump 0.12.1
body-clock Oct 20, 2021
685c7f5
Merge branch 'fix/166-new-term-crash' into 'development'
Oct 20, 2021
ebb03f6
allow images in viewing mode
body-clock Oct 20, 2021
4956aa2
bump version 0.12.2
body-clock Oct 20, 2021
10dfd34
Merge branch 'feature/167-images-in-share-link' into 'development'
Oct 20, 2021
f5e05b9
add comment to term controller
body-clock Oct 20, 2021
c7c6935
Merge branch 'feature/167-images-in-share-link' into 'development'
Oct 20, 2021
8c6eeea
fix attachment of new term: ensure ID has 'Term_' in front of it when…
Oct 22, 2021
f1234f3
Merge branch 'development' into 'master'
emeryr-upenn Oct 22, 2021
36817a9
Run pipeline on merges to master
lts-andrewnk Oct 22, 2021
d6a6100
Merge branch 'fix/run_pipeline_on_master' into 'development'
emeryr-upenn Oct 22, 2021
6e537a2
parameterize shelfmark in png export
body-clock Nov 10, 2021
20636e9
enable redux dev tracing
body-clock Nov 10, 2021
894757e
apply clone payload to state to update list of projects
body-clock Nov 10, 2021
91fc65f
disable import type radio group
body-clock Nov 11, 2021
9bc03af
re-enable import button
body-clock Nov 11, 2021
b94199c
change import text to clarify json only
body-clock Nov 11, 2021
41fcc8a
add exception notifier
body-clock Nov 11, 2021
9427114
add notifier to development
body-clock Nov 11, 2021
cd1211c
bump version for notifier
body-clock Nov 11, 2021
954d312
add gemfile lock
body-clock Nov 11, 2021
0de8516
Merge branch 'exception-notifier-test' into 'development'
Nov 11, 2021
be76e3e
resolve master conflict
body-clock Nov 12, 2021
5a3009e
Merge branch 'development' into 'master'
Nov 12, 2021
de72cdd
Merge branch 'development' into bug-fixes-1110
body-clock Nov 12, 2021
ad3307f
honeybadger changes
body-clock Nov 12, 2021
908c4d3
honeybadger config
body-clock Nov 12, 2021
b8a7434
bump version 0.12.4 for honeybadger
body-clock Nov 12, 2021
36dacd7
Merge branch 'honeybadger' into 'development'
Nov 12, 2021
c3818b1
Update .gitlab-ci.yml
Nov 12, 2021
8f4cee3
add comment
body-clock Nov 12, 2021
f489326
Merge branch 'development' into feature/add-build-rule
body-clock Nov 12, 2021
5f3744d
Merge branch 'feature/add-build-rule' into 'development'
Nov 12, 2021
c743fdb
add Honeybadger config initializer
body-clock Nov 12, 2021
c5ae2e2
bump version 0.12.5
body-clock Nov 12, 2021
811e881
Merge branch 'fix/honeybadger-api-key' into 'development'
Nov 17, 2021
30c58d7
Merge branch 'master' into development
body-clock Nov 17, 2021
5fdc9bf
Merge branch 'development' into 'master'
Nov 18, 2021
58bc0d3
Merge branch 'development' into bug-fixes-1110
body-clock Nov 22, 2021
deac1ac
bump version 0.13.0
body-clock Nov 23, 2021
016d8e4
repair adding subgroups in empty group
body-clock Nov 23, 2021
6360333
Merge branch 'bug-fixes-1110' into 'development'
Nov 23, 2021
f026ba6
Merge branch 'development' into 'master'
Nov 23, 2021
1860f89
turn unparseable JSON into empty manifest
body-clock Dec 8, 2021
3590510
accept failing json, but return a non-functional manifest
body-clock Dec 8, 2021
884c7be
reformat
body-clock Dec 8, 2021
6b012ab
Merge branch 'fix/171-reject-failing-json' into 'development'
Dec 8, 2021
92ef2f4
resolve conflict
body-clock Dec 8, 2021
684da7a
bump version 0.13.1
body-clock Dec 8, 2021
df73f45
Merge branch 'development' into 'master'
Dec 8, 2021
bdded96
ensure that we can find the object that we are trying to map from the…
body-clock Dec 9, 2021
452567e
bump version 0.13.2
body-clock Dec 9, 2021
c52d5dd
Merge branch 'fix/172-complex-clone-fails-on-share' into 'development'
Dec 9, 2021
6888843
Merge branch 'development' into 'master'
Dec 9, 2021
4d677aa
WIP: Adding alternate entry point
emeryr-upenn Dec 13, 2021
75aee90
update docker compose dev to accommodate new indrovora context
body-clock Dec 13, 2021
32740d4
Merge branch 'fix/173-mitigate-log4j-vulnerability' into 'development'
emeryr-upenn Dec 13, 2021
a6b1857
Merge branch 'development' into 'master'
emeryr-upenn Dec 13, 2021
07454ae
update idrovora dockerfile
body-clock Dec 15, 2021
dfb3ca4
change find . to find /root
body-clock Dec 15, 2021
5270593
Merge branch 'fix/175-update-l4j-mitigation' into 'development'
Dec 15, 2021
e5c0eab
log4j vulnerability handling 0.13.3
body-clock Dec 15, 2021
1f88836
update idrovora image to read from gitlab registry
body-clock Dec 17, 2021
d32dab8
create custom error, handle standard error from application controller
body-clock Dec 17, 2021
33dced7
remove rescue block around export, call new error
body-clock Dec 17, 2021
8eb16a2
add new error types
body-clock Dec 17, 2021
7eaf64e
remove rescue statement from updateMultiple
body-clock Dec 17, 2021
f7784b3
authorize project with external method
body-clock Dec 17, 2021
1be8c9f
remove rescue loop from export show method, fix set_project method
body-clock Dec 22, 2021
724eb32
format
body-clock Dec 22, 2021
8c619f3
remove begin rescue loop from feedback create, use unless instad of i…
body-clock Dec 22, 2021
b503d72
remove rescue from filter show
body-clock Dec 22, 2021
1c8868e
remove rescue from filter controller, authorize project in set_project
body-clock Dec 22, 2021
1984892
restore project find functionality
body-clock Dec 22, 2021
cabb70b
raise vcerror instead of render and return
body-clock Dec 22, 2021
210e225
remove rescue from create method and reformat
body-clock Dec 22, 2021
e0ffb2a
error handling fixes for group controller
body-clock Dec 22, 2021
d4579c6
clean up update method
body-clock Dec 22, 2021
b5541d8
update destroy
body-clock Dec 22, 2021
5d2e780
update destroymultiple
body-clock Dec 22, 2021
3ba2af8
restore update, remove rescue next from destroy multiple
body-clock Dec 22, 2021
ed5fba8
finish group controller by removing rescue and authorizing in set_group
body-clock Dec 22, 2021
d6284e7
raise vcerror in filter show
body-clock Dec 22, 2021
ddbae1a
raise vcerror in group creation if group doesn't save
body-clock Dec 22, 2021
844dd3d
image controller changes
body-clock Dec 22, 2021
f5b30e9
reformat image controller
body-clock Dec 22, 2021
9abb486
fix leafs controller error reporting
body-clock Jan 7, 2022
1b71961
reformat leafs controller
body-clock Jan 7, 2022
f3a7b37
fix projects controller error handling
body-clock Jan 7, 2022
dade163
reformat projects controller
body-clock Jan 7, 2022
47bc3c3
fix registrations controller
body-clock Jan 7, 2022
9b1624a
fix sessions controller
body-clock Jan 7, 2022
f73db7f
update sides controller
body-clock Jan 7, 2022
211350a
reformat sides controller
body-clock Jan 7, 2022
acd830a
fix update error handling
body-clock Jan 7, 2022
6f8d2c0
fix terms controller
body-clock Jan 7, 2022
7c5f200
reformat terms controller
body-clock Jan 7, 2022
3f344d1
fix users controller
body-clock Jan 7, 2022
52d4acc
reformat users controller
body-clock Jan 7, 2022
aa0661b
update xproc controller
body-clock Jan 7, 2022
8eefabb
reformat xprox controller
body-clock Jan 7, 2022
c838beb
fix export failure message
body-clock Jan 7, 2022
246d55c
fix import controller
body-clock Jan 7, 2022
c2ddb08
reformat import controller
body-clock Jan 7, 2022
8bbd298
Merge branch 'feature/176-improved-error-handling' into 'development'
Jan 10, 2022
21f5c50
bump version 0.14.0
body-clock Jan 10, 2022
8777a63
Merge branch 'development' into 'master'
Jan 10, 2022
4838a3a
remove AND conjunction choice
body-clock Jan 11, 2022
654c189
remove AND conjunction from filter helper query_types
body-clock Jan 11, 2022
c0491f0
create image URL with function on image model, call that function fro…
body-clock Jan 18, 2022
bb97101
add full messages to error messages
body-clock Jan 18, 2022
e51d1a5
bump version 0.14.1
body-clock Jan 18, 2022
69ccf51
Merge branch 'bug-fixes-11-1-22' into 'development'
Jan 19, 2022
1fb4b80
enforce UTF8 when reading input stream
body-clock Jan 20, 2022
dbddabd
Merge branch 'development' into 'master'
Jan 20, 2022
b0dc38c
Merge branch 'fix/182-png-conversion-error' into 'development'
Jan 20, 2022
d893a2e
don't create folioNumber element if the pageNotation value is empty
body-clock Jan 24, 2022
53726c2
reassign empty folio/page numbers to nil
body-clock Jan 24, 2022
0f20130
add callback on leaf/side model that ensures that folio/page number i…
body-clock Jan 24, 2022
1a30746
bump version 0.14.2
body-clock Jan 24, 2022
177fcee
remove redundant code in side import
body-clock Jan 24, 2022
aa0e31b
Merge branch 'fix/185-blank-folioNumber-in-XML' into 'development'
Jan 24, 2022
1875ee8
Add communication channel links
emeryr-upenn Jan 25, 2022
02fd690
Merge branch 'feature/180-add-invites-to-account-email' into 'develop…
Jan 25, 2022
26ea306
Merge branch 'development' into 'master'
Jan 25, 2022
515ef0d
add project ID to undoFolioNumbers request
body-clock Jan 25, 2022
f8ce181
Merge branch 'fix/181-update-multiple-leaves-missing-projectid' into …
Jan 25, 2022
a87d6ae
remove accidental testing code from image controller
body-clock Jan 25, 2022
8793382
Merge branch 'fix/184-image-not-authorized-to-user' into 'development'
Jan 25, 2022
6c6854b
add URI to on-the-fly term creation
body-clock Jan 26, 2022
d62933d
Merge branch 'fix/182-failed-term-save' into 'development'
Jan 26, 2022
7458033
convert empty strings to 0 in xslt
body-clock Jan 26, 2022
090a9da
bump version 0.14.3
body-clock Feb 2, 2022
2b38791
Merge branch 'development' into 'master'
Feb 3, 2022
c6807bc
force utf8 encoding when writing SVG data to disk
body-clock Feb 4, 2022
9121ce7
0.14.4
body-clock Feb 4, 2022
6fe75be
Merge branch 'fix/force-utf8-encoding-in-svg' into 'development'
Feb 4, 2022
db25e90
Merge branch 'development' into 'master'
Feb 4, 2022
1087a32
WIP: add buttons to leafinfobox
body-clock Feb 15, 2022
990a6ae
Merge branch 'development' into fix/broken-html-export
body-clock Feb 15, 2022
c4d0307
WIP: Apply duplicate output filenames fix
emeryr-upenn Feb 15, 2022
77784e3
bump version 0.14.5
body-clock Feb 15, 2022
dd79502
define buttons separately
body-clock Feb 16, 2022
2c292cf
WIP: add openseadragon popups for bifolia buttons
body-clock Feb 16, 2022
51957e7
test for DIY images
body-clock Feb 16, 2022
58b46fd
fix image links
body-clock Feb 16, 2022
7d726cc
edit button sizing
body-clock Feb 16, 2022
84b92c4
bump version 0.14.6
body-clock Feb 16, 2022
2481172
change button wording
body-clock Feb 16, 2022
cadd0f1
add detection for first conjoin
body-clock Feb 17, 2022
1669e69
ensure that bifolia of a conjoin (inside/outside) always match up
body-clock Feb 17, 2022
c56863c
test if recto or verso doesn't have image attached - don't do anythin…
body-clock Feb 23, 2022
ba981bb
don't show buttons if no image
body-clock Feb 28, 2022
6f5aec4
fix DIY prop misspelling
body-clock Feb 28, 2022
8a590fe
Merge branch 'feature/189-bifolia' into 'development'
Feb 28, 2022
52f6263
Merge branch 'development' of https://gitlab.library.upenn.edu/kislak…
emeryr-upenn Feb 28, 2022
8d51051
Merge branch 'development' into fix/broken-html-export
emeryr-upenn Feb 28, 2022
e529442
Merge branch 'fix/broken-html-export' into 'development'
emeryr-upenn Feb 28, 2022
cf449f8
Bump version to v0.14.6
emeryr-upenn Feb 28, 2022
811ed4e
Merge branch 'development' into 'master'
emeryr-upenn Feb 28, 2022
a83617e
update filter functionality to mirror modified attributes
body-clock Jun 2, 2023
f259740
update Viscoll references to VCEditor where necessary
body-clock Jun 7, 2023
ebaebfb
set logging to debug for more information
body-clock Jun 8, 2023
fb4f092
add before save callback to groups to handle nil group members and log
body-clock Jun 9, 2023
648b51a
increase healthcheck interval
body-clock Jun 9, 2023
a8fdb07
restore tagged loggin while maintaining debug logging
body-clock Jun 9, 2023
0fef7e0
change language in filter
body-clock Jun 27, 2023
8386dd8
add link to VCEditor
body-clock Jun 28, 2023
5406171
bump version 0.14.7
body-clock Jun 28, 2023
033f94f
Merge branch '205-improve-application-logging' into 'staging'
body-clock Jun 28, 2023
0e86ef2
Merge branch '203-applicationcontroller-vcerror-in-filter-show' into …
body-clock Jun 29, 2023
8fd6d3e
bump staging version
body-clock Jun 29, 2023
7f37329
Merge branch 'staging' into 206-change-page-title-tag-from-viscoll-to…
body-clock Jun 29, 2023
11ae4b8
bump 14.9
body-clock Jun 29, 2023
48afb30
Merge branch '206-change-page-title-tag-from-viscoll-to-vceditor' int…
body-clock Jun 29, 2023
1d84cdc
changing docker ci-template project ref to use tag release
erickg9m Apr 4, 2024
41b8c35
Merge branch 'ci-template-change' into 'staging'
emeryr-upenn May 28, 2024
070c072
Add multiple IIIF manifest label handling
emeryr-upenn Jun 4, 2026
ca72e45
Update test mongodb URL for the docker env
emeryr-upenn Jun 4, 2026
4f93fe5
In development output emails to logging instead of using smtp
emeryr-upenn Jun 4, 2026
154136a
Add callback to downcase user emails on save
emeryr-upenn Jun 4, 2026
3927881
Update package-lock.json
emeryr-upenn Jun 4, 2026
6e52cd9
Import the XProc service Idrovora and upgrade to XProc 3
gremid Jun 8, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
node_modules
build
60 changes: 58 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,66 @@
/.bundle

# Ignore all logfiles and tempfiles.
/log/*
/tmp/*
*/log/*
*/tmp/*
!/log/.keep
!/tmp/.keep

# Ignore Byebug command history file.
.byebug_history

# Ignore Mac files
*.DS_Store

# Ignore Visual Studio files
.vscode

# Ignore caches
*.sass-cache

/public/swagger/

*.idea

# React app stuff

# dependencies
*/node_modules

# testing
*/coverage

# production
*/build

# documentation
styleguide

# misc
*.DS_Store

*.env.local
*.env.development.local
*.env.test.local
*.env.production.local

*npm-debug.log*
*yarn-debug.log*
*yarn-error.log*

coverage
jest_0
test.log
*.xml
!/viscoll-api/spec/fixtures/*.xml

# DIY images
viscoll-api/uploads/*

# secret scan
secrets_scan.json

.env
.docker-environment-dev
viscoll-api/.generators
viscoll-api/public/uploads
137 changes: 137 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,137 @@
include:
- project: "devops/gitlab/ci-templates/docker"
ref: "0.0.1"
file:
- ".build_docker_image.yml"
- ".push_docker_image.yml"
- ".remove_docker_image.yml"
- project: "devops/gitlab/ci-templates/sast"
ref: "master"
file:
- ".shiftleft_container_scanning.yml"
- ".trivy_container_scanning.yml"

workflow:
rules:
- if: $CI_MERGE_REQUEST_IID
- if: $CI_COMMIT_TAG
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
- if: $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == 'master'
- if: $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == 'development'

stages:
- sast:project
- build:web
- build:xproc
- sast:web
- sast:xproc
- push:web
- push:xproc
- remove:web
- remove:xproc

shiftleft_project_scanning:
stage: sast:project
extends:
- .shiftleft_container_scanning
tags:
- build
allow_failure: true

build_web_image:
stage: build:web
extends:
- .build_docker_image
needs:
- shiftleft_project_scanning
variables:
CI_IMAGE_NAME: "${CI_PROJECT_ID}-${CI_PIPELINE_ID}-web"
tags:
- build

build_xproc_image:
stage: build:xproc
extends:
- .build_docker_image
needs:
- shiftleft_project_scanning
variables:
CI_IMAGE_NAME: "${CI_PROJECT_ID}-${CI_PIPELINE_ID}-xproc"
DOCKER_BUILD_CONTEXT: "viscoll-xproc/"
DOCKERFILE_PATH: "viscoll-xproc/"
tags:
- build

trivy_web_container_scanning:
stage: sast:web
extends:
- .trivy_container_scanning
needs:
- build_web_image
variables:
CI_IMAGE_NAME: "${CI_PROJECT_ID}-${CI_PIPELINE_ID}-web"
tags:
- build
allow_failure: true

trivy_xproc_container_scanning:
stage: sast:xproc
extends:
- .trivy_container_scanning
needs:
- build_xproc_image
variables:
CI_IMAGE_NAME: "${CI_PROJECT_ID}-${CI_PIPELINE_ID}-xproc"
tags:
- build
allow_failure: true

push_web_image_to_registry:
stage: push:web
extends:
- .push_docker_image
needs:
- trivy_web_container_scanning
variables:
CI_IMAGE_NAME: "${CI_PROJECT_ID}-${CI_PIPELINE_ID}-web"
DOCKER_IMAGE_NAME: "vceditor_web"
tags:
- build

push_xproc_image_to_registry:
stage: push:xproc
extends:
- .push_docker_image
needs:
- trivy_xproc_container_scanning
variables:
CI_IMAGE_NAME: "${CI_PROJECT_ID}-${CI_PIPELINE_ID}-xproc"
DOCKER_IMAGE_NAME: "vceditor_xproc"
tags:
- build

remove_web_image:
stage: remove:web
extends:
- .remove_docker_image
needs:
- push_web_image_to_registry
variables:
CI_IMAGE_NAME: "${CI_PROJECT_ID}-${CI_PIPELINE_ID}-web"
rules:
- when: always
tags:
- build

remove_xproc_image:
stage: remove:xproc
extends:
- .remove_docker_image
needs:
- push_xproc_image_to_registry
variables:
CI_IMAGE_NAME: "${CI_PROJECT_ID}-${CI_PIPELINE_ID}-xproc"
rules:
- when: always
tags:
- build
111 changes: 111 additions & 0 deletions .gitleaks.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
title = "gitleaks config"
[[rules]]
description = "Password in string"
regex = '''(?i)[\w]*(password|secret)[\w]* *[:=>,]+ *['"][\S]{2,}['"]'''
[rules.allowlist]
description = "Exceptions"
paths = [
'''(.*?)\.erb$''',
'''(.*?)\.yml$''',
'''spec/(.*?)''',
'''reference_data\.rb''',
'''lib/sdbmss/legacy\.rb''',
'''lib/sdbmss/seed_data.rb''',
'''viscoll-api/config/environments/development.rb''',
'''jena/jena.env''',
'''.lando.yml''',
'''config/initializers/mailer.rb''',
'''vendor/assets/javascripts/URI\.min\.js'''
]
regexes = [
'''\w\.password_(field|confirmation)''',
'''^\s*#'''
]
[[rules]]
description = "Password in YAML config"
regex = '''(?i)[\w]*(password|secret)[\w]* *: *[\S]{2,}'''
[rules.allowlist]
description = "Exceptions"
paths = [
'''(.*?)\.e?rb$''',
'''spec/(.*?)''',
'''reference_data\.rb''',
'''config/secrets.yml''',
'''lib/sdbmss/legacy\.rb''',
'''vendor/assets/javascripts/URI\.min\.js'''
]
[[rules]]
description = "AWS"
regex = '''AKIA[0-9A-Z]{16}'''
[[rules]]
description = "RKCS8"
regex = '''-----BEGIN PRIVATE KEY-----'''
[[rules]]
description = "RSA"
regex = '''-----BEGIN RSA PRIVATE KEY-----'''
[[rules]]
description = "Github"
regex = '''(?i)github.*['\"][0-9a-zA-Z]{35,40}['\"]'''
[[rules]]
description = "SSH"
regex = '''-----BEGIN OPENSSH PRIVATE KEY-----'''
[[rules]]
description = "Facebook"
regex = '''(?i)facebook.*['\"][0-9a-f]{32}['\"]'''
[[rules]]
description = "Twitter"
regex = '''(?i)twitter.*['\"][0-9a-zA-Z]{35,44}['\"]'''
[[rules]]
description = "PGP"
regex = '''-----BEGIN PGP PRIVATE KEY BLOCK-----'''
[[rules]]
description = "Slack token"
regex = '''xox[baprs]-.*'''
[[rules]]
description = "Strip API Key"
regex = '''(?i)(sk|pk)_(test|live)_[0-9a-zA-Z]{10,32}'''
# Global allowlist
[allowlist]
description = "Global Allowlists"
files = [
'''(.*?)(jpg|gif|doc|pdf|bin|md)$''',
'''viscoll-api/config/environments/development.rb''',
'''.*__test__.*`''',
'''viscoll-api/app/mailers/mailer\.rb''',
'''\.gitleaks\.toml'''
]
regexes = [
# Ignore resetPasswordRequest method
'''resetPasswordRequest''',
# Ignore docker set secrets
'''(?i)(/run/secrets/)''',
# Values set by Ansible variables
'''{{ *[\S]+ *}}''',
# Values set by environment variables
'''ENV\[['"][\S]+['"]\]''',
# ansible
'''security_ssh_password_authentication''',
# miscallaneous false positives
# password in comments
'''^\s*# password:''',
# state resets in React
'''update: \{password: "", current_password: "", email: ""\}''',
'''register: \{email: "", password: ""\}''',
'''[Pp]assword\w*:\s*""''',
'''[Pp]assword\w*:\s*false''',
'''newPasswordConfirm:\s*false''',
'''current_password: this\.state\.currentPassword''',
'''password: this\.state\.newPassword''',
'''currentPassword:\s*nextProps\.currentPasswordError\.toString''',
'''password_confirmation: this.state.passwordConfirm''',
'''password: this.state.password''',
'''[Pp]assword\w*:\s*PropTypes\.''',
# method names and non-password vars
'''resetPassword: \(reset_token, password\)''',
'''@reset_password_url =''',
# error message
'''password:\s*\["can't be''',
# test data
'''reset_password_token = "5951303fc9bf3c7b9a573a3f"''',
'''password\w*: "secret"'''
]
1 change: 0 additions & 1 deletion .ruby-gemset

This file was deleted.

2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby-2.4.0
2.6.0
32 changes: 32 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
FROM node:14 as app

WORKDIR /app

ENV PATH /app/node_modules/.bin:$PATH

COPY viscoll-app/package.json ./
COPY viscoll-app/package-lock.json ./

RUN npm ci --silent

COPY viscoll-app .

RUN npm run build

FROM ruby:2.7
RUN apt-get update && apt-get install -y librsvg2-bin

# throw errors if Gemfile has been modified since Gemfile.lock
RUN bundle config --global frozen 1

WORKDIR /usr/src/app

COPY viscoll-api/Gemfile viscoll-api/Gemfile.lock ./
RUN bundle install

COPY viscoll-api .

COPY --from=app /app/build /usr/src/app/public

ENTRYPOINT ["bundle", "exec", "rails"]
CMD []
8 changes: 8 additions & 0 deletions Dockerfile.api
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
FROM ruby:2.7

RUN apt-get update && apt-get install -y librsvg2-bin

WORKDIR /app
COPY viscoll-api/Gemfile viscoll-api/Gemfile.lock ./
RUN bundle install

Loading