diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 9b28445ce04..52ded5939ce 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -5,9 +5,3 @@ updates: directory: / schedule: interval: daily - - # Maintain dependencies for Docker - - package-ecosystem: docker - directory: / - schedule: - interval: daily \ No newline at end of file diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 19e3fe6afd8..86ceb1d0e03 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -262,31 +262,6 @@ jobs: path: | rskj-core/build/reports/ - unit-tests-java21: - needs: build - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 #v4.2.1 - - - name: Setup Java & Gradle - uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 #v4.4.0 - with: - java-version: '21' - distribution: 'temurin' - cache: 'gradle' - - - uses: actions/cache/restore@3624ceb22c1c5a301c8db4169662070a689d9ea8 #v4.1.1 - name: Restore Gradle Wrapper - with: - path: | - gradle/wrapper/gradle-wrapper.jar - key: gradle-wrapper-v1 - fail-on-cache-miss: true - - - name: Run tests - run: | - ./gradlew --no-daemon --stacktrace test - integration-tests: needs: build runs-on: ubuntu-latest diff --git a/.github/workflows/docker.yml b/.github/workflows/docker-release.yml similarity index 90% rename from .github/workflows/docker.yml rename to .github/workflows/docker-release.yml index 24642b3453f..5223f4604b8 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker-release.yml @@ -1,6 +1,6 @@ -name: Docker image +name: Docker image release -on: +on: push: branches: - master @@ -36,10 +36,10 @@ jobs: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Build and push + - name: Build and push to registry uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 #v6.9.0 with: context: . push: true tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} + labels: ${{ steps.meta.outputs.labels }} \ No newline at end of file diff --git a/.github/workflows/docker-verification.yml b/.github/workflows/docker-verification.yml new file mode 100644 index 00000000000..8d5d412f770 --- /dev/null +++ b/.github/workflows/docker-verification.yml @@ -0,0 +1,36 @@ +name: Docker image validation + +on: + pull_request: + paths: + - 'Dockerfile' + - '.github/workflows/docker-verification.yml' + types: [opened, synchronize, reopened] + +# Declare default permissions as read only. +permissions: read-all + +jobs: + docker: + runs-on: ubuntu-20.04 + + steps: + - name: Checkout + uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 #v4.2.1 + + - name: Build Docker image for validation + run: | + docker build -t rsksmart/rskj:latest . + + - name: Run Docker container + run: | + docker run -d --name rskj-container rsksmart/rskj:latest --regtest + + - name: Check Docker container built + run: | + if [ $(docker inspect -f '{{.State.Running}}' rskj-container) = "true" ]; then + echo "Container is running properly" + else + echo "Container failed to start" + exit 1 + fi \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index aa1a19af3b0..420be6c5f8b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:21-jdk@sha256:5ad4efff3364b06c61578b267138359bcba92acc20dfd533f35b75c709a6f10b AS build +FROM eclipse-temurin:17-jdk@sha256:0613a19436dc8f745914b25235d43f3b0eddb8d432d19edce30ffaf2d2f95403 AS build RUN apt-get update -y && \ apt-get install -y git curl gnupg @@ -19,7 +19,7 @@ RUN gpg --keyserver https://secchannel.rsk.co/SUPPORT.asc --recv-keys 1DC9157991 modifier=$(sed -n 's/^modifier=//p' "$file" | tr -d "\"'") && \ cp "rskj-core/build/libs/rskj-core-$version_number-$modifier-all.jar" rsk.jar -FROM eclipse-temurin:21-jre@sha256:4c1ec9743c333c9d47f55d883c4e317d117e198899e7edf1d9cf4c89253b1b9d +FROM eclipse-temurin:17-jre@sha256:38e0afc86a10bf4cadbf1586fb617b3a9a4d09c9a0be882e29ada4ed0895fc84 LABEL org.opencontainers.image.authors="ops@rootstocklabs.com" RUN useradd -ms /sbin/nologin -d /var/lib/rsk rsk diff --git a/rskj-core/src/main/java/co/rsk/util/PreflightChecksUtils.java b/rskj-core/src/main/java/co/rsk/util/PreflightChecksUtils.java index d2e65891c8e..77e480641ef 100644 --- a/rskj-core/src/main/java/co/rsk/util/PreflightChecksUtils.java +++ b/rskj-core/src/main/java/co/rsk/util/PreflightChecksUtils.java @@ -28,7 +28,7 @@ public class PreflightChecksUtils { private static final Logger logger = LoggerFactory.getLogger(PreflightChecksUtils.class); public static final Set SUPPORTED_JAVA_VERSIONS = Collections.unmodifiableSet( - new TreeSet<>(Arrays.asList(17, 21)) + new TreeSet<>(Arrays.asList(17)) ); private final RskContext rskContext; diff --git a/rskj-core/src/main/resources/version.properties b/rskj-core/src/main/resources/version.properties index 47f29493a74..68570cf2c2b 100644 --- a/rskj-core/src/main/resources/version.properties +++ b/rskj-core/src/main/resources/version.properties @@ -1,2 +1,2 @@ -versionNumber='6.5.0' +versionNumber='6.5.1' modifier="ARROWHEAD" diff --git a/rskj-core/src/test/java/co/rsk/util/PreflightChecksUtilsTest.java b/rskj-core/src/test/java/co/rsk/util/PreflightChecksUtilsTest.java index a370b9c83a4..82afe0efb05 100644 --- a/rskj-core/src/test/java/co/rsk/util/PreflightChecksUtilsTest.java +++ b/rskj-core/src/test/java/co/rsk/util/PreflightChecksUtilsTest.java @@ -71,7 +71,7 @@ void runChecks_invalidJavaVersion_exceptionIsThrown() { @Test void runChecks_runAllChecks_OK() throws Exception { - for (String ver : Arrays.asList("17.0.3", "21.0.1")) { + for (String ver : Arrays.asList("17.0.3")) { try (RskContext rskContext = new RskTestContext(tempDir)) { PreflightChecksUtils preflightChecksUtilsSpy = spy(new PreflightChecksUtils(rskContext));