diff --git a/.github/workflows/maven-build.yml b/.github/workflows/maven-build.yml new file mode 100644 index 0000000..3a7876f --- /dev/null +++ b/.github/workflows/maven-build.yml @@ -0,0 +1,83 @@ +name: build on maven + +on: + watch: + types: [started] + pull_request: + types: [opened, reopened, edited, synchronize, ready_for_review] + push: + branches: + - main + - master + - '**' + workflow_dispatch: + +jobs: + verify: + name: verify with maven + runs-on: ubuntu-latest + env: + MAVEN_OPTS: "-Xmx4096m -Xms2048m -XX:MaxMetaspaceSize=4096m -Xss8m" + steps: + - uses: actions/checkout@v4 + + - name: Set up JDK 8 & 11 for x64 + uses: actions/setup-java@v3 + with: + distribution: 'temurin' + architecture: x64 + java-version: | + 8 + 11 + + - uses: s4u/maven-settings-action@v2.8.0 + with: + sonatypeSnapshots: true + + - name: Build the Maven verify phase + run: mvn -B -V clean install + + - name: Checkout tools repo + if: ${{ github.event_name == 'push' }} + uses: actions/checkout@v4 + with: + repository: Shokakucarrier/commonjava-images + path: commonjava-images + + - name: Locate artifacts + if: ${{ github.event_name == 'push' }} + id: locate-artifacts + run: | + jar=$(ls -d $PWD/target/reptoro-*-fat.jar) + cp "$jar" "commonjava-images/reptoro/app.jar" + + - name: Log in to Quay.io + if: ${{ github.event_name == 'push' }} + uses: redhat-actions/podman-login@v1 + with: + username: ${{ secrets.QUAY_USERNAME }} + password: ${{ secrets.QUAY_TOKEN }} + registry: quay.io + + - name: Buildah build + if: ${{ github.event_name == 'push' }} + id: buildah-build + uses: redhat-actions/buildah-build@v2 + with: + image: reptoro + tags: ${{ github.ref_name }} + platforms: linux/amd64 + containerfiles: | + ./commonjava-images/reptoro/Dockerfile + context: ./commonjava-images/reptoro/ + build-args: | + jar_ur=app.jar + + - name: Push To quay.io + if: ${{ github.event_name == 'push' }} + id: push-to-quay + uses: redhat-actions/push-to-registry@v2 + with: + image: ${{ steps.buildah-build.outputs.image }} + tags: ${{ steps.buildah-build.outputs.tags }} + registry: quay.io/factory2 diff --git a/.project b/.project index 88c5fa1..6fb11f7 100644 --- a/.project +++ b/.project @@ -20,4 +20,15 @@ org.eclipse.jdt.core.javanature org.eclipse.m2e.core.maven2Nature + + + 1701062264767 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/pom.xml b/pom.xml index bfbf912..08b194c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,10 +4,22 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + + org.commonjava + commonjava + 18 + + com.commonjava.reptoro reptoro 1.0-SNAPSHOT + + scm:git:https://github.com/commonjava/reptoro + scm:git:https://github.com/commonjava/reptoro + https://github.com/Commonjava/reptoro + HEAD + UTF-8 @@ -336,56 +348,7 @@ src/main/resources/conf/config.json - - io.fabric8 - fabric8-maven-plugin - 4.2.0 - - true - true - - - - - - - - - app - reptoro - - - - - - - quay.io/factory2/reptoro - - ${basedir}/src/main/docker - - /deployments - ${project.basedir}/src/main/resources/assembly/release.xml - - - /deployments - ${vertx.main.class} - - - - - - - - - resource - build - deploy - - - - - diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile deleted file mode 100644 index d6e3836..0000000 --- a/src/main/docker/Dockerfile +++ /dev/null @@ -1,47 +0,0 @@ -#FROM fabric8/s2i-java:2.3 -FROM registry.redhat.io/redhat-openjdk-18/openjdk18-openshift - -ENV JAVA_APP_DIR=/deployments \ - JAVA_OPTIONS="-Dvertx.cacheDirBase=/tmp -Dvertx.disableDnsResolver=true" -# -Dvertx.disableDnsResolver=true -LABEL org.label-schema.description="" \ - org.label-schema.version=1.0.0-SNAPSHOT \ - org.label-schema.schema-version=1.0 \ - org.label-schema.build-date=2020-02-26T12:14:12.656 \ - org.label-schema.name=reptoro \ - org.label-schema.vcs-ref=6a027fe935ab79adfefe54966d7182eb727d71c9 \ - org.label-schema.vcs-url=https://github.com/geored/reptoro.git -EXPOSE 8080 8778 9779 -USER root -COPY maven /deployments/ -#RUN cd /etc/pki/ca-trust/source/anchors -#RUN curl -O https://password.corp.redhat.com/RH-IT-Root-CA.crt -COPY maven/Eng_Ops_CA.crt /etc/pki/ca-trust/source/anchors/Eng_Ops_CA.crt -COPY maven/Red_Hat_IS_CA.crt /etc/pki/ca-trust/source/anchors/Red_Hat_IS_CA.crt -COPY maven/RH-IT-Root-CA.crt /etc/pki/ca-trust/source/anchors/RH-IT-Root-CA.crt -COPY maven/paas_psi_redhat_com.crt /etc/pki/ca-trust/source/anchors/paas_psi_redhat_com.crts -RUN cd /etc/pki/ca-trust/source/anchors && update-ca-trust extract && update-ca-trust enable - -#ENV jdk.tls.client.cipherSuites true - -RUN cd /etc/pki/ca-trust/source/anchors && \ - curl -O --insecure https://password.corp.redhat.com/RH-IT-Root-CA.crt && \ - curl -O --insecure https://password.corp.redhat.com/legacy.crt && \ - curl -O --insecure https://engineering.redhat.com/Eng-CA.crt && \ - update-ca-trust extract \ - update-ca-trust enable - -#RUN cd $JAVA_HOME/lib/security \ -# && keytool -keystore cacerts -storepass changeit -noprompt -trustcacerts -importcert -alias redhatcert -file /etc/pki/ca-trust/source/anchors/RH-IT-Root-CA.crt - -#RUN keytool -genkey -keyalg RSA -alias redhat -keystore keystore.jks -validity 360 -keysize 2048s -RUN keytool -import -alias redhat.com -storepass changeit -noprompt -trustcacerts -import -file /etc/pki/ca-trust/source/anchors/paas_psi_redhat_com.crt -keystore $JAVA_HOME/lib/security/cacerts -RUN keytool -import -alias redhat.com -storepass changeit -noprompt -trustcacerts -import -file /etc/pki/ca-trust/source/anchors/Eng_Ops_CA.crt -keystore $JAVA_HOME/lib/security/cacerts -RUN keytool -import -alias redhat1.com -storepass changeit -noprompt -trustcacerts -import -file /etc/pki/ca-trust/source/anchors/Red_Hat_IS_CA.crt -keystore $JAVA_HOME/lib/security/cacerts -RUN keytool -import -alias redhat2.com -storepass changeit -noprompt -trustcacerts -import -file /etc/pki/ca-trust/source/anchors/RH-IT-Root-CA.crt -keystore $JAVA_HOME/lib/security/cacerts - -#RUN keytool -import -alias redhat.com -storepass changeit -noprompt -trustcacerts -import -file /etc/pki/ca-trust/source/anchors/Eng-CA.crt -keystore $JAVA_HOME/lib/security/cacerts -#RUN keytool -import -alias redhat1.com -storepass changeit -noprompt -trustcacerts -import -file /etc/pki/ca-trust/source/anchors/legacy.crt -keystore $JAVA_HOME/lib/security/cacerts -#RUN keytool -import -alias redhat2.com -storepass changeit -noprompt -trustcacerts -import -file /etc/pki/ca-trust/source/anchors/RH-IT-Root-CA.crt -keystore $JAVA_HOME/lib/security/cacerts -# -USER 1001 \ No newline at end of file diff --git a/src/main/docker/Eng_Ops_CA.crt b/src/main/docker/Eng_Ops_CA.crt deleted file mode 100644 index 0decd23..0000000 --- a/src/main/docker/Eng_Ops_CA.crt +++ /dev/null @@ -1,31 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIFVzCCBMCgAwIBAgICCfYwDQYJKoZIhvcNAQEFBQAwgZ0xCzAJBgNVBAYTAlVT -MRcwFQYDVQQIEw5Ob3J0aCBDYXJvbGluYTEQMA4GA1UEBxMHUmFsZWlnaDEWMBQG -A1UEChMNUmVkIEhhdCwgSW5jLjELMAkGA1UECxMCSVMxFjAUBgNVBAMTDVJlZCBI -YXQgSVMgQ0ExJjAkBgkqhkiG9w0BCQEWF3N5c2FkbWluLXJkdUByZWRoYXQuY29t -MB4XDTEzMTAxMDAzMzU1N1oXDTIzMTAwODAzMzU1N1owgZ4xCzAJBgNVBAYTAlVT -MRcwFQYDVQQIEw5Ob3J0aCBDYXJvbGluYTEWMBQGA1UEChMNUmVkIEhhdCwgSW5j -LjEcMBoGA1UECxMTUmVkIEhhdCBFbmdpbmVlcmluZzEdMBsGA1UEAxMURW5naW5l -ZXJpbmcgU2VydmljZXMxITAfBgkqhkiG9w0BCQEWEmVuZy1vcHNAcmVkaGF0LmNv -bTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAL+qI5W1hwSiV/WbZ5Qu -VZlTTT7av55x2T265wRQoRcmLc5CiLC3MKPITFNrVXdtP5GkBltANXJgh1tmLZ0A -Qyc0M9diqTubJy0bEZctiNrkRhbDfWUkzRvM6ex9E2D+wBKFn5SqmYALDMTZbLCB -wplzLUFr86KllsrQWwpOtVCU4oVLg4QYVA7rNJ24joKtHVdBwLuLSZBVvHj5F0o6 -9rmXoeK2QyyjxVErZzEPEJNflpjVFUKYQCURl7sSrhMCrO+tV7zqCJR2RD50h+mC -xMDexxqlo+L+mLwh5Ygf2dvCRynU9pycvsslM6JmFlFWSYH2vggUhmsu04vEXZnJ -cg6zUf1Reqq8tu9oCHAEpmdsRptoEP7yrk6ejNXXKM3m/E3dZJk/yX8qPpd5L1rV -RIL9d/2oMtxuENSnlCg2hJLj+0HZYdMw7pvtAEQvRe/8atGxaEzhMsGsGav3g3Fu -DSqqW5sy68BBgkzeYRbg7nb7h3L7UT09uvabGpuRWJ/DMLOjWsBb30TbdoyP+SPl -YVtzRXwbVZVhn35q546DivHFS793gZq5NaGcY/X+OfvqkLItXE3L7TF5U9LimetB -B6n8cf7wmARRlEWAqdbu767Zhvit2W9Xk7zw3Z+IPZkAWqzITQHC3a9WEcW5img9 -/EFL1xl1Bq9aBmB7EYNYfc37AgMBAAGjggEdMIIBGTAdBgNVHQ4EFgQU7NMtF3qg -ZRcqAIFJtfqUkjKPqWEwgcoGA1UdIwSBwjCBv4AUDawZcO0Ep154q/6LqDTrISbB -VjWhgaOkgaAwgZ0xCzAJBgNVBAYTAlVTMRcwFQYDVQQIEw5Ob3J0aCBDYXJvbGlu -YTEQMA4GA1UEBxMHUmFsZWlnaDEWMBQGA1UEChMNUmVkIEhhdCwgSW5jLjELMAkG -A1UECxMCSVMxFjAUBgNVBAMTDVJlZCBIYXQgSVMgQ0ExJjAkBgkqhkiG9w0BCQEW -F3N5c2FkbWluLXJkdUByZWRoYXQuY29tggEBMAwGA1UdEwQFMAMBAf8wHQYDVR0R -BBYwFIESZW5nLW9wc0ByZWRoYXQuY29tMA0GCSqGSIb3DQEBBQUAA4GBAG5WDCD7 -GrcsU4AHVkQ4w7i6dv6PsgIxuM3rA021yEJYxUF6bfM3r8paesIAK5gPzKGFy1oL -+bBr+x+fqLyNjpRLOOzgKIR1YjqEcAz10YzwvY0vUa/WlWOteOlX5OU3PEl4TlJH -nlJHO+8hx6Y+86OflarhH460prU/P5RKRptT ------END CERTIFICATE----- diff --git a/src/main/docker/RH-IT-Root-CA.crt b/src/main/docker/RH-IT-Root-CA.crt deleted file mode 100644 index f306f00..0000000 --- a/src/main/docker/RH-IT-Root-CA.crt +++ /dev/null @@ -1,25 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIENDCCAxygAwIBAgIJANunI0D662cnMA0GCSqGSIb3DQEBCwUAMIGlMQswCQYD -VQQGEwJVUzEXMBUGA1UECAwOTm9ydGggQ2Fyb2xpbmExEDAOBgNVBAcMB1JhbGVp -Z2gxFjAUBgNVBAoMDVJlZCBIYXQsIEluYy4xEzARBgNVBAsMClJlZCBIYXQgSVQx -GzAZBgNVBAMMElJlZCBIYXQgSVQgUm9vdCBDQTEhMB8GCSqGSIb3DQEJARYSaW5m -b3NlY0ByZWRoYXQuY29tMCAXDTE1MDcwNjE3MzgxMVoYDzIwNTUwNjI2MTczODEx -WjCBpTELMAkGA1UEBhMCVVMxFzAVBgNVBAgMDk5vcnRoIENhcm9saW5hMRAwDgYD -VQQHDAdSYWxlaWdoMRYwFAYDVQQKDA1SZWQgSGF0LCBJbmMuMRMwEQYDVQQLDApS -ZWQgSGF0IElUMRswGQYDVQQDDBJSZWQgSGF0IElUIFJvb3QgQ0ExITAfBgkqhkiG -9w0BCQEWEmluZm9zZWNAcmVkaGF0LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP -ADCCAQoCggEBALQt9OJQh6GC5LT1g80qNh0u50BQ4sZ/yZ8aETxt+5lnPVX6MHKz -bfwI6nO1aMG6j9bSw+6UUyPBHP796+FT/pTS+K0wsDV7c9XvHoxJBJJU38cdLkI2 -c/i7lDqTfTcfLL2nyUBd2fQDk1B0fxrskhGIIZ3ifP1Ps4ltTkv8hRSob3VtNqSo -GxkKfvD2PKjTPxDPWYyruy9irLZioMffi3i/gCut0ZWtAyO3MVH5qWF/enKwgPES -X9po+TdCvRB/RUObBaM761EcrLSM1GqHNueSfqnho3AjLQ6dBnPWlo638Zm1VebK -BELyhkLWMSFkKwDmne0jQ02Y4g075vCKvCsCAwEAAaNjMGEwHQYDVR0OBBYEFH7R -4yC+UehIIPeuL8Zqw3PzbgcZMB8GA1UdIwQYMBaAFH7R4yC+UehIIPeuL8Zqw3Pz -bgcZMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEB -CwUAA4IBAQBDNvD2Vm9sA5A9AlOJR8+en5Xz9hXcxJB5phxcZQ8jFoG04Vshvd0e -LEnUrMcfFgIZ4njMKTQCM4ZFUPAieyLx4f52HuDopp3e5JyIMfW+KFcNIpKwCsak -oSoKtIUOsUJK7qBVZxcrIyeQV2qcYOeZhtS5wBqIwOAhFwlCET7Ze58QHmS48slj -S9K0JAcps2xdnGu0fkzhSQxY8GPQNFTlr6rYld5+ID/hHeS76gq0YG3q6RLWRkHf -4eTkRjivAlExrFzKcljC4axKQlnOvVAzz+Gm32U0xPBF4ByePVxCJUHw1TsyTmel -RxNEp7yHoXcwn+fXna+t5JWh1gxUZty3 ------END CERTIFICATE----- diff --git a/src/main/docker/Red_Hat_IS_CA.crt b/src/main/docker/Red_Hat_IS_CA.crt deleted file mode 100644 index f746839..0000000 --- a/src/main/docker/Red_Hat_IS_CA.crt +++ /dev/null @@ -1,22 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDsDCCAxmgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMCVVMx -FzAVBgNVBAgTDk5vcnRoIENhcm9saW5hMRAwDgYDVQQHEwdSYWxlaWdoMRYwFAYD -VQQKEw1SZWQgSGF0LCBJbmMuMQswCQYDVQQLEwJJUzEWMBQGA1UEAxMNUmVkIEhh -dCBJUyBDQTEmMCQGCSqGSIb3DQEJARYXc3lzYWRtaW4tcmR1QHJlZGhhdC5jb20w -HhcNMDkwOTE2MTg0NTI1WhcNMTkwOTE0MTg0NTI1WjCBnTELMAkGA1UEBhMCVVMx -FzAVBgNVBAgTDk5vcnRoIENhcm9saW5hMRAwDgYDVQQHEwdSYWxlaWdoMRYwFAYD -VQQKEw1SZWQgSGF0LCBJbmMuMQswCQYDVQQLEwJJUzEWMBQGA1UEAxMNUmVkIEhh -dCBJUyBDQTEmMCQGCSqGSIb3DQEJARYXc3lzYWRtaW4tcmR1QHJlZGhhdC5jb20w -gZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAN/HDWGiL8BarUWDIjNC6uxCXqYN -QkwcmhILX+cl+YuDDArFL1pYVrith228gF3dSUU5X7kIOmPkkjNheRkbnas61X+n -i3+KWvbX3q+h5VMxKX2cA1U+R3jLuXqYjF+N2gkPyPvxeoDuEncKAItw+mK/r+4L -WBb5nFzek7hP3017AgMBAAGjgf0wgfowHQYDVR0OBBYEFA2sGXDtBKdeeKv+i6g0 -6yEmwVY1MIHKBgNVHSMEgcIwgb+AFA2sGXDtBKdeeKv+i6g06yEmwVY1oYGjpIGg -MIGdMQswCQYDVQQGEwJVUzEXMBUGA1UECBMOTm9ydGggQ2Fyb2xpbmExEDAOBgNV -BAcTB1JhbGVpZ2gxFjAUBgNVBAoTDVJlZCBIYXQsIEluYy4xCzAJBgNVBAsTAklT -MRYwFAYDVQQDEw1SZWQgSGF0IElTIENBMSYwJAYJKoZIhvcNAQkBFhdzeXNhZG1p -bi1yZHVAcmVkaGF0LmNvbYIBATAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUA -A4GBAFBgO5y3JcPXH/goumNBW7rr8m9EFZmQyK5gT1Ljv5qaCSZwxkAomhriv04p -mb1y8yjrK5OY3WwgaRaAWRHp4/hn2HWaRvx3S+gwLM7p8V1pWnbSFJOXF3kbuC41 -voMIMqAFfHKidKN/yrjJg/1ahIjSt11lMUvRJ4TNT+pk5VnB ------END CERTIFICATE----- diff --git a/src/main/docker/paas_psi_redhat_com.crt b/src/main/docker/paas_psi_redhat_com.crt deleted file mode 100644 index 13f7182..0000000 --- a/src/main/docker/paas_psi_redhat_com.crt +++ /dev/null @@ -1,31 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIFQTCCBCmgAwIBAgIED/8NUjANBgkqhkiG9w0BAQsFADBBMRAwDgYDVQQKDAdS -ZWQgSGF0MQ0wCwYDVQQLDARwcm9kMR4wHAYDVQQDDBVDZXJ0aWZpY2F0ZSBBdXRo -b3JpdHkwHhcNMTkwMTMwMjEzOTI4WhcNMjEwMTI5MjEzOTI4WjCBpzELMAkGA1UE -BhMCVVMxFzAVBgNVBAgMDk5vcnRoIENhcm9saW5hMRAwDgYDVQQHDAdSYWxlaWdo -MRYwFAYDVQQKDA1SZWQgSGF0LCBJbmMuMRMwEQYDVQQLDApQblQgRGV2T3BzMRww -GgYDVQQDDBNwYWFzLnBzaS5yZWRoYXQuY29tMSIwIAYJKoZIhvcNAQkBFhNoZWxw -LW9wc0ByZWRoYXQuY29tMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA -rrk03iWIz6DGyztSZAN7lKnTL9puP54tDdFjnMDmE6ITvJdLuLhTbwrDpn7USU9n -MyijtefoRQRveE1xC9HxBImh18dwPvn/hXRNMI6KBTEMqdFknc4uthApNOZORqRR -kxBeQ/fDaIj0g4GY5vqonOBIIh/bzoNRgWEq4FogLNGKzS57Wg16OldXD8cwwshg -xJQZZfA5Z5eaGxhQrKLqRDn+Xw5s1uk+aGiF2Y6PwiOHANkTi5XdUFTX8Pn1YFu/ -SccRYQ0LCkNJwghyuJ4Y6UGtLOZ33J3J6owcVMZqaJ297dQXnISnSumq9oPpGDp/ -uaRq2t0l0lHFsknZHUS8VUJMeg/5EH1chg0kgk6vOCRMHQBEg7E1t/JnLVWbzQ++ -i31LIXTKl0aHzpIiwqUc170o0p1yh9cfeIVk311XUglPcdQAJLwgs5jkFGGaiTdL -HcIlT1MV4GdTyzw9lJ3Te2n/v8+ueYQYLJmvuCeFteXlhFGK8OZgi1utZCbRtNgG -RIWFJ/+npFD9S3ypGSARify/X/RrmBmIAgu8BoxGFA+e/7+3lEUpZARfd7v9yiRo -Kzog1YP1Zz5AeNoYFbijpDCxNpnT36RKLzT4XBQw3/qAFMAXXRR3RhBkKsoNBGY/ -Uh4XUNuCJXts32cHjS6ww/jCClohVQNGeb7QpSsCn5kCAwEAAaOB2TCB1jAfBgNV -HSMEGDAWgBR72gn1SV3Z11zJNvhV0huXnhEvfjA7BggrBgEFBQcBAQQvMC0wKwYI -KwYBBQUHMAGGH2h0dHA6Ly9vY3NwLnJlZGhhdC5jb20vY2Evb2NzcC8wDgYDVR0P -AQH/BAQDAgTwMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBHBgNVHREE -QDA+ghNwYWFzLnBzaS5yZWRoYXQuY29tgidsYi0xMS5wYWFzLnByb2QudXBzaGlm -dC5yZHUyLnJlZGhhdC5jb20wDQYJKoZIhvcNAQELBQADggEBAE1XfdjmLaIqfzTv -aqQmbVzT702WJuLbIj23aJuNBVVSYHdHRXzAaKVdRtRo4z8IeNOQj8Bo+Y8BbgEO -x6v3HbP8FcUwEYLl5GByFjx4qyCwEZT8KrKPYPz6iXyTcduNDJ8/sMOj8wckComH -GJlMMcOCjfy1dgDSZpXIBFXBAO9PH2poui8MOPsynxb0d/TRcOFH0WutOcQ7SCUb -5CDzfArOe+lpKsgd9KL/hpGniuYlBu+rh9YmFHlxlEWzBrUtqiSKOW3U0Y4QYh3o -JXOed7Hhtty5pSxUfv9ga2wNFaDAqAULctEWWO+m0ixEqqwR70AyN2sMAm6+NRvA -YRnzKNY= ------END CERTIFICATE-----