Skip to content

Commit

Permalink
molecule: use image with nginx instead of manually running nginx comp…
Browse files Browse the repository at this point in the history
…onent
  • Loading branch information
dometto committed Nov 13, 2024
1 parent a6b5a25 commit 0e486a6
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 17 deletions.
4 changes: 0 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,4 +0,0 @@
[submodule "plugin-nginx"]
path = plugin-nginx
url = https://gitlab.com/dometto/plugin-nginx.git
branch = molecule_compatibility
2 changes: 1 addition & 1 deletion molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ driver:
password: $DOCKER_PW
platforms:
- name: workspace-src-ubuntu_jammy
image: ghcr.io/utrechtuniversity/src-test-workspace:ubuntu_jammy
image: ghcr.io/utrechtuniversity/src-test-workspace:ubuntu_jammy-nginx
<<: *image_settings
command: /sbin/init
volumes:
Expand Down
11 changes: 0 additions & 11 deletions molecule/default/prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,3 @@
name: ansible
version: 9.4.0
state: present

- name: Run nginx component
ansible.builtin.import_playbook: ../../plugin-nginx/plugin-nginx.yml
vars:
rsc_nginx_authorization_endpoint: http://localhost
rsc_nginx_user_info_endpoint: http://localhost
rsc_nginx_service_url: localhost
nginx_enable_ssl: false
nginx_enable_auth: true
rsc_nginx_oauth2_application:
client_id: foo
1 change: 0 additions & 1 deletion plugin-nginx
Submodule plugin-nginx deleted from dd7ca3

0 comments on commit 0e486a6

Please sign in to comment.