Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Create docker images for databases #1204

Merged
merged 3 commits into from
Sep 9, 2022
Merged

Create docker images for databases #1204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
363f2dd
Create docker images for DB containers
christianlupus Sep 9, 2022
9dce3f1
Pull images for automatic build as well
christianlupus Sep 9, 2022
da99e77
Update changelog
christianlupus Sep 9, 2022
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
35 changes: 29 additions & 6 deletions .github/actions/run-tests/test_runner/docker_management.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,19 @@ def pullImages(args, quiet=True):
p.pr.run(cmd).check_returncode()

imageName = 'nextcloudcookbook/testci:php{version}'.format(version=args.php_version[0])
cmd = ['docker', 'pull', '--quiet', imageName]
if not quiet:
cmd = [x for x in cmd if x != '--quiet']
sp = p.pr.run(cmd)
if sp.returncode == 0:
p.pr.run(['docker', 'tag', imageName, 'cookbook_unittesting_dut'])

def runPull(localName, remoteName):
quietPart = ['--quiet'] if quiet else []
cmdPull = ['docker', 'pull'] + quietPart + [remoteName]
pull = p.pr.run(cmdPull)
if pull.returncode == 0:
p.pr.run(['docker', 'tag', remoteName, localName])
else:
l.logger.printWarning('Failure loading upstream docker image.')

runPull('cookbook_unittesting_dut', imageName)
runPull('cookbook_unittesting_mysql', 'nextcloudcookbook/mariadb-test:latest')
runPull('cookbook_unittesting_postgres', 'nextcloudcookbook/postgres-test:latest')

l.logger.printTask('Pulling images finished')

Expand Down Expand Up @@ -46,11 +53,27 @@ def pushImages(args):
'docker', 'tag', 'cookbook_unittesting_dut', pushedName
]).check_returncode()

p.pr.run([
'docker', 'tag', 'cookbook_unittesting_mysql', 'nextcloudcookbook/mariadb-test:latest'
]).check_returncode()

p.pr.run([
'docker', 'tag', 'cookbook_unittesting_postgres', 'nextcloudcookbook/postgres-test:latest'
]).check_returncode()

l.logger.printTask('Pushing docker images to repository')
p.pr.run([
'docker', 'push', pushedName
]).check_returncode()

p.pr.run([
'docker', 'push', 'nextcloudcookbook/mariadb-test:latest'
]).check_returncode()

p.pr.run([
'docker', 'push', 'nextcloudcookbook/postgres-test:latest'
]).check_returncode()

def handleDockerImages(args):
t = test_runner.timer.Timer()

Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
- Fix API endpoint helpers to enforce JSON answers and minor styling enhancements
[#1202](https://github.com/nextcloud/cookbook/pull/1202) @christianlupus

### Maintenance
- Use the pre-built database images for MySQL and PostgreSQL tests
[#1204](https://github.com/nextcloud/cookbook/pull/1204) @christianlupus

### Removed
- Remove the deprecated endpoints from version 0.9.15
[#1200](https://github.com/nextcloud/cookbook/pull/1200) @christianlupus
Expand Down