Skip to content

Commit b8bf86a

Browse files
committed
Merge branch '8305-rm-perl-docker-aio' into 8305-payara6-ee10-v3 #8305
2 parents 3e36753 + b829ca7 commit b8bf86a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+9
-3488
lines changed

.github/workflows/cypress_ui.yml.future

+1-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#
33
# THIS IS AN OLD TRAVIS-CI.ORG JOB FILE
44
# To be used with Github Actions, it would be necessary to refactor it.
5+
# In addition, it needs to be rewritten to use our modern containers.
56
# Keeping it as the future example it has been before.
67
# See also #5846
78
#
@@ -30,8 +31,6 @@ jobs:
3031
directories:
3132
# we also need to cache folder with Cypress binary
3233
- ~/.cache
33-
# we want to cache the Glassfish and Solr dependencies as well
34-
- conf/docker-aio/dv/deps
3534
before_install:
3635
- cd tests
3736
install:

.github/workflows/shellcheck.yml

-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ jobs:
3333
# Exclude old scripts
3434
exclude: |
3535
*/.git/*
36-
conf/docker-aio/*
3736
doc/*
3837
downloads/*
3938
scripts/database/*

.gitignore

-14
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,6 @@ scripts/api/setup-all.*.log
3939
# ctags generated tag file
4040
tags
4141

42-
# dependencies I'm not sure we're allowed to redistribute / have in version control
43-
conf/docker-aio/dv/deps/
44-
45-
# no need to check aoi installer zip into vc
46-
conf/docker-aio/dv/install/dvinstall.zip
47-
# or copy of test data
48-
conf/docker-aio/testdata/
49-
50-
# docker-aio creates maven/ which reports 86 new files. ignore this wd.
51-
maven/
52-
5342
scripts/installer/default.config
5443
*.pem
5544

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

74-
# apache-maven is downloaded by docker-aio
75-
apache-maven*
76-
7763
# Docker development volumes
7864
/docker-dev-volumes

conf/docker-aio/0prep_deps.sh

-19
This file was deleted.

conf/docker-aio/1prep.sh

-39
This file was deleted.

conf/docker-aio/c8.dockerfile

-87
This file was deleted.

conf/docker-aio/configure_doi.bash

-24
This file was deleted.

conf/docker-aio/disableipv6.conf

-1
This file was deleted.

0 commit comments

Comments
 (0)