Skip to content

Commit

Permalink
Merge branch '8305-rm-perl-docker-aio' into 8305-payara6-ee10-v3 #8305
Browse files Browse the repository at this point in the history
  • Loading branch information
pdurbin committed Aug 7, 2023
2 parents 3e36753 + b829ca7 commit b8bf86a
Show file tree
Hide file tree
Showing 57 changed files with 9 additions and 3,488 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/cypress_ui.yml.future
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#
# THIS IS AN OLD TRAVIS-CI.ORG JOB FILE
# To be used with Github Actions, it would be necessary to refactor it.
# In addition, it needs to be rewritten to use our modern containers.
# Keeping it as the future example it has been before.
# See also #5846
#
Expand Down Expand Up @@ -30,8 +31,6 @@ jobs:
directories:
# we also need to cache folder with Cypress binary
- ~/.cache
# we want to cache the Glassfish and Solr dependencies as well
- conf/docker-aio/dv/deps
before_install:
- cd tests
install:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/shellcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ jobs:
# Exclude old scripts
exclude: |
*/.git/*
conf/docker-aio/*
doc/*
downloads/*
scripts/database/*
Expand Down
14 changes: 0 additions & 14 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,6 @@ scripts/api/setup-all.*.log
# ctags generated tag file
tags

# dependencies I'm not sure we're allowed to redistribute / have in version control
conf/docker-aio/dv/deps/

# no need to check aoi installer zip into vc
conf/docker-aio/dv/install/dvinstall.zip
# or copy of test data
conf/docker-aio/testdata/

# docker-aio creates maven/ which reports 86 new files. ignore this wd.
maven/

scripts/installer/default.config
*.pem

Expand All @@ -71,8 +60,5 @@ scripts/search/data/binary/trees.png.thumb140
src/main/webapp/resources/images/cc0.png.thumb140
src/main/webapp/resources/images/dataverseproject.png.thumb140

# apache-maven is downloaded by docker-aio
apache-maven*

# Docker development volumes
/docker-dev-volumes
19 changes: 0 additions & 19 deletions conf/docker-aio/0prep_deps.sh

This file was deleted.

39 changes: 0 additions & 39 deletions conf/docker-aio/1prep.sh

This file was deleted.

87 changes: 0 additions & 87 deletions conf/docker-aio/c8.dockerfile

This file was deleted.

24 changes: 0 additions & 24 deletions conf/docker-aio/configure_doi.bash

This file was deleted.

1 change: 0 additions & 1 deletion conf/docker-aio/disableipv6.conf

This file was deleted.

Loading

0 comments on commit b8bf86a

Please sign in to comment.