diff --git a/assets/Makefile b/assets/Makefile new file mode 100644 index 0000000000..df17a9f332 --- /dev/null +++ b/assets/Makefile @@ -0,0 +1,46 @@ + +SIZE="1280px" +HOST=t400s.home.org.au +HOSTIP:=10.10.10.151 +HOSTURL=https://$(HOST) +IMAGE=svendowideit/screenshot +#IMAGE=screenshot +RUNOPTS=docker run --rm -v $(CURDIR):/srv --add-host $(HOST):10.10.10.151 +RUN=$(RUNOPTS) $(IMAGE) + +all: + # Needs to be run with no authentication + $(RUN) $(HOSTURL)/admin/logs/ admin-logs.png $(SIZE) + $(RUN) $(HOSTURL)/admin/settings/auth/ admin-settings-authentication.png $(SIZE) + $(RUN) $(HOSTURL)/admin/settings/general admin-settings.png $(SIZE) + $(RUN) $(HOSTURL)/admin/settings/security admin-settings-security.png $(SIZE) + $(RUN) $(HOSTURL)/admin/settings/storage admin-settings-storage.png $(SIZE) + $(RUN) $(HOSTURL)/admin/settings/license admin-settings-license.png $(SIZE) + +manual: + # --env-file=passwords.env + $(RUNOPTS) --env-file=passwords.env \ + $(IMAGE) \ + $(HOSTURL)/admin/settings#auth admin-settings-authentication-basic.png $(SIZE) + + #admin-settings-authentication-ldap.png + + +# TODO: needs manual intervention atm +qs1: + # this requires the hostname to resolve. + echo "$HOST $HOSTIP" >> /etc/hosts + # and requires that host to be added to the docker daemon's insecure registry settings + # maybe use a dind daemon? + + docker pull jenkins + docker tag -f jenkins t400s.home.org.au/ci-infrastructure/jnkns-img + docker push t400s.home.org.au/ci-infrastructure/jnkns-img + sleep 1 + $(RUN) $(HOSTURL)/admin/ console-push.png $(SIZE) + sleep 10 +qs2: + docker rmi jenkins t400s.home.org.au/ci-infrastructure/jnkns-img + docker pull t400s.home.org.au/ci-infrastructure/jnkns-img + sleep 1 + $(RUN) $(HOSTURL)/admin/ console-pull.png $(SIZE) diff --git a/assets/admin-logs.png b/assets/admin-logs.png index ec5caf7fea..c8fa50e7fa 100644 Binary files a/assets/admin-logs.png and b/assets/admin-logs.png differ diff --git a/assets/admin-metrics.png b/assets/admin-metrics.png deleted file mode 100644 index 72caa1f163..0000000000 Binary files a/assets/admin-metrics.png and /dev/null differ diff --git a/assets/admin-settings-authentication-basic.png b/assets/admin-settings-authentication-basic.png index fee59ffd5b..9eb3a1207f 100644 Binary files a/assets/admin-settings-authentication-basic.png and b/assets/admin-settings-authentication-basic.png differ diff --git a/assets/admin-settings-authentication-ldap.png b/assets/admin-settings-authentication-ldap.png index 7c46d0d473..ea94a04203 100644 Binary files a/assets/admin-settings-authentication-ldap.png and b/assets/admin-settings-authentication-ldap.png differ diff --git a/assets/admin-settings-authentication.png b/assets/admin-settings-authentication.png index 145102a698..1c0edc7c55 100644 Binary files a/assets/admin-settings-authentication.png and b/assets/admin-settings-authentication.png differ diff --git a/assets/admin-settings-http-unlicensed.png b/assets/admin-settings-http-unlicensed.png deleted file mode 100644 index 04f7196233..0000000000 Binary files a/assets/admin-settings-http-unlicensed.png and /dev/null differ diff --git a/assets/admin-settings-http.png b/assets/admin-settings-http.png deleted file mode 100644 index 1591f5efff..0000000000 Binary files a/assets/admin-settings-http.png and /dev/null differ diff --git a/assets/admin-settings-license.png b/assets/admin-settings-license.png index 7e5b4c8f2c..415a1bb620 100644 Binary files a/assets/admin-settings-license.png and b/assets/admin-settings-license.png differ diff --git a/assets/admin-settings-security.png b/assets/admin-settings-security.png index 22672c7029..946f74064a 100644 Binary files a/assets/admin-settings-security.png and b/assets/admin-settings-security.png differ diff --git a/assets/admin-settings-storage-azure.png b/assets/admin-settings-storage-azure.png new file mode 100644 index 0000000000..8af326e434 Binary files /dev/null and b/assets/admin-settings-storage-azure.png differ diff --git a/assets/admin-settings-storage-s3.png b/assets/admin-settings-storage-s3.png new file mode 100644 index 0000000000..587c54b1fb Binary files /dev/null and b/assets/admin-settings-storage-s3.png differ diff --git a/assets/admin-settings-storage.png b/assets/admin-settings-storage.png index 2b6fb0d197..1997e9b9e2 100644 Binary files a/assets/admin-settings-storage.png and b/assets/admin-settings-storage.png differ diff --git a/assets/admin-settings.png b/assets/admin-settings.png index 1591f5efff..e9f64f8aad 100644 Binary files a/assets/admin-settings.png and b/assets/admin-settings.png differ