Merge pull request #87 from RADAR-base/release-0.4.0

Release 0.4.0

.dockerignore

@@ -3,8 +3,6 @@
 .idea
 out
 build
-*/out
 */src/test
-*/build
 *.iml
 .gradletasknamecache

.github/workflows/main.yml

@@ -0,0 +1,143 @@
+# Continuous integration, including test and integration test
+name: Main test
+
+# Run in master and dev branches and in all pull requests to those branches
+on:
+ push:
+ branches: [ master, dev ]
+ pull_request:
+ branches: [ master, dev ]
+
+env:
+ DOCKER_IMAGE: radarbase/kafka-connect-rest-fitbit-source
+
+jobs:
+ # Build and test the code
+ kotlin:
+ # The type of runner that the job will run on
+ runs-on: ubuntu-latest
+
+ # Steps represent a sequence of tasks that will be executed as part of the job
+ steps:
+ # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+ - uses: actions/checkout@v2
+
+ - uses: actions/setup-java@v1
+ with:
+ java-version: 11
+
+ - name: Cache
+ uses: actions/cache@v2
+ with:
+ # Cache gradle directories
+ path: |
+ ~/.gradle/caches
+ ~/.gradle/wrapper
+ # Key for restoring and saving the cache
+ key: ${{ runner.os }}-gradle-${{ hashFiles('gradlew', '**/*.gradle', 'gradle.properties', 'gradle/**') }}
+ restore-keys: |
+ ${{ runner.os }}-gradle-
+
+ # Compile the code
+ - name: Compile code
+ run: ./gradlew assemble
+
+ # Gradle check
+ - name: Check
+ run: ./gradlew check
+
+ docker:
+ # The type of runner that the job will run on
+ runs-on: ubuntu-latest
+
+ # Steps represent a sequence of tasks that will be executed as part of the job
+ steps:
+ # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+ - uses: actions/checkout@v2
+
+ - name: Docker build parameters
+ id: docker_params
+ run: |
+ echo "::set-output name=has_docker_login::${{ secrets.DOCKERHUB_USERNAME != '' && secrets.DOCKERHUB_TOKEN != '' }}"
+ if [ "${{ github.event_name == 'pull_request' }}" = "true" ]; then
+ echo "::set-output name=push::false"
+ echo "::set-output name=load::true"
+ echo "::set-output name=platforms::linux/amd64"
+ else
+ echo "::set-output name=push::true"
+ echo "::set-output name=load::false"
+ echo "::set-output name=platforms::linux/amd64,linux/arm64"
+ fi
+
+ - name: Cache Docker layers
+ id: cache_buildx
+ uses: actions/cache@v2
+ with:
+ path: /tmp/.buildx-cache
+ key: ${{ runner.os }}-buildx-${{ steps.docker_params.outputs.push }}-${{ hashFiles('**/Dockerfile', '**/*.gradle', 'gradle.properties', '.dockerignore', '*/src/main/**', 'docker/**') }}
+ restore-keys: |
+ ${{ runner.os }}-buildx-${{ steps.docker_params.outputs.push }}-
+ ${{ runner.os }}-buildx-
+
+ - name: Login to Docker Hub
+ if: steps.docker_params.outputs.has_docker_login == 'true'
+ uses: docker/login-action@v1
+ with:
+ username: ${{ secrets.DOCKERHUB_USERNAME }}
+ password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+ # Add Docker labels and tags
+ - name: Docker meta
+ id: docker_meta
+ uses: crazy-max/ghaction-docker-meta@v2
+ with:
+ images: ${{ env.DOCKER_IMAGE }}
+
+ # Setup docker build environment
+ - name: Set up QEMU
+ uses: docker/setup-qemu-action@v1
+
+ - name: Set up Docker Buildx
+ uses: docker/setup-buildx-action@v1
+
+ - name: Cache parameters
+ id: cache-parameters
+ run: |
+ if [ "${{ steps.cache_buildx.outputs.cache-hit }}" = "true" ]; then
+ echo "::set-output name=cache-to::"
+ else
+ echo "::set-output name=cache-to::type=local,dest=/tmp/.buildx-cache-new,mode=max"
+ fi
+
+ - name: Build docker
+ uses: docker/build-push-action@v2
+ with:
+ cache-from: type=local,src=/tmp/.buildx-cache
+ cache-to: ${{ steps.cache-parameters.outputs.cache-to }}
+ platforms: ${{ steps.docker_params.outputs.platforms }}
+ load: ${{ steps.docker_params.outputs.load }}
+ push: ${{ steps.docker_params.outputs.push }}
+ tags: ${{ steps.docker_meta.outputs.tags }}
+ # Use runtime labels from docker_meta as well as fixed labels
+ labels: |
+ ${{ steps.docker_meta.outputs.labels }}
+ maintainer=Joris Borgdorff <joris@thehyve.nl>, Nivethika Mahasivam <nivethika@thehyve.nl>, Pauline Conde <pauline.conde@kcl.ac.uk>
+ org.opencontainers.image.description=RADAR-base upload connector backend application
+ org.opencontainers.image.authors=Joris Borgdorff <joris@thehyve.nl>, Nivethika Mahasivam <nivethika@thehyve.nl>, Pauline Conde <pauline.conde@kcl.ac.uk>
+ org.opencontainers.image.vendor=RADAR-base
+ org.opencontainers.image.licenses=Apache-2.0
+
+ - name: Pull docker image
+ if: steps.docker_params.outputs.load == 'false'
+ run: docker pull ${{ env.DOCKER_IMAGE }}:${{ steps.docker_meta.outputs.version }}
+
+ - name: Inspect docker image
+ run: |
+ docker image inspect ${{ env.DOCKER_IMAGE }}:${{ steps.docker_meta.outputs.version }}
+ docker run --rm ${{ env.DOCKER_IMAGE }}:${{ steps.docker_meta.outputs.version }} curl --help
+
+ - name: Move docker build cache
+ if: steps.cache_buildx.outputs.cache-hit != 'true'
+ run: |
+ rm -rf /tmp/.buildx-cache
+ mv /tmp/.buildx-cache-new /tmp/.buildx-cache

.github/workflows/release.yml

@@ -0,0 +1,96 @@
+# Create release files
+name: Release
+
+on:
+ release:
+ types: [ published ]
+
+env:
+ DOCKER_IMAGE: radarbase/kafka-connect-rest-fitbit-source
+
+jobs:
+ uploadBackend:
+ # The type of runner that the job will run on
+ runs-on: ubuntu-latest
+
+ # Steps represent a sequence of tasks that will be executed as part of the job
+ steps:
+ # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+ - uses: actions/checkout@v2
+ - uses: actions/setup-java@v1
+ with:
+ java-version: 11
+
+ - name: Gradle cache
+ uses: actions/cache@v2
+ with:
+ # Cache gradle directories
+ path: |
+ ~/.gradle/caches
+ ~/.gradle/wrapper
+ # An explicit key for restoring and saving the cache
+ key: ${{ runner.os }}-gradle-${{ hashFiles('gradlew', '**/*.gradle', 'gradle.properties', 'gradle/**') }}
+ restore-keys: |
+ ${{ runner.os }}-gradle-
+
+ # Compile code
+ - name: Compile code
+ run: ./gradlew jar
+
+ # Upload it to GitHub
+ - name: Upload to GitHub
+ uses: AButler/upload-release-assets@v2.0
+ with:
+ files: "*/build/libs/*"
+ repo-token: ${{ secrets.GITHUB_TOKEN }}
+
+ # Build and push tagged release docker image
+ docker:
+ # The type of runner that the job will run on
+ runs-on: ubuntu-latest
+
+ # Steps represent a sequence of tasks that will be executed as part of the job
+ steps:
+ - uses: actions/checkout@v2
+
+ # Setup docker build environment
+ - name: Set up QEMU
+ uses: docker/setup-qemu-action@v1
+ - name: Set up Docker Buildx
+ uses: docker/setup-buildx-action@v1
+
+ - name: Login to DockerHub
+ uses: docker/login-action@v1
+ with:
+ username: ${{ secrets.DOCKERHUB_USERNAME }}
+ password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+ # Add Docker labels and tags
+ - name: Docker meta
+ id: docker_meta
+ uses: crazy-max/ghaction-docker-meta@v2
+ with:
+ images: ${{ env.DOCKER_IMAGE }}
+ tags: |
+ type=semver,pattern={{version}}
+ type=semver,pattern={{major}}.{{minor}}
+
+ - name: Build docker
+ uses: docker/build-push-action@v2
+ with:
+ platforms: linux/amd64,linux/arm64
+ push: true
+ tags: ${{ steps.docker_meta.outputs.tags }}
+ # Use runtime labels from docker_meta_backend as well as fixed labels
+ labels: |
+ ${{ steps.docker_meta.outputs.labels }}
+ maintainer=Joris Borgdorff <joris@thehyve.nl>, Nivethika Mahasivam <nivethika@thehyve.nl>, Pauline Conde <pauline.conde@kcl.ac.uk>
+ org.opencontainers.image.description=RADAR-base upload connector backend application
+ org.opencontainers.image.authors=Joris Borgdorff <joris@thehyve.nl>, Nivethika Mahasivam <nivethika@thehyve.nl>, Pauline Conde <pauline.conde@kcl.ac.uk>
+ org.opencontainers.image.vendor=RADAR-base
+ org.opencontainers.image.licenses=Apache-2.0
+
+ - name: Inspect image
+ run: |
+ docker pull ${{ env.DOCKER_IMAGE }}:${{ steps.docker_meta.outputs.version }}
+ docker image inspect ${{ env.DOCKER_IMAGE }}:${{ steps.docker_meta.outputs.version }}

Dockerfile

@@ -12,41 +12,32 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM openjdk:8-alpine as builder
+FROM gradle:7.2-jdk11 as builder
 
 RUN mkdir /code
 WORKDIR /code
 
-ENV GRADLE_OPTS -Dorg.gradle.daemon=false
+ENV GRADLE_USER_HOME=/code/.gradlecache \
+ GRADLE_OPTS="-Dorg.gradle.vfs.watch=false"
 
-COPY ./gradle/wrapper /code/gradle/wrapper
-COPY ./gradlew /code/
-RUN ./gradlew --version
-
-COPY ./build.gradle ./settings.gradle /code/
+COPY ./build.gradle ./settings.gradle ./gradle.properties /code/
 COPY kafka-connect-rest-source/build.gradle /code/kafka-connect-rest-source/
-
-RUN ./gradlew downloadDependencies copyDependencies
-
 COPY kafka-connect-fitbit-source/build.gradle /code/kafka-connect-fitbit-source/
 
-RUN ./gradlew downloadDependencies copyDependencies
+RUN gradle downloadDependencies copyDependencies
 
 COPY ./kafka-connect-rest-source/src/ /code/kafka-connect-rest-source/src
-
-RUN ./gradlew jar
-
 COPY ./kafka-connect-fitbit-source/src/ /code/kafka-connect-fitbit-source/src
 
-RUN ./gradlew jar
+RUN gradle jar
 
-FROM confluentinc/cp-kafka-connect-base:5.5.2
+FROM confluentinc/cp-kafka-connect-base:6.2.0-3-ubi8
 
 MAINTAINER Joris Borgdorff <joris@thehyve.nl>
 
 LABEL description="Kafka REST API Source connector"
 
-ENV CONNECT_PLUGIN_PATH /usr/share/java/kafka-connect/plugins
+ENV CONNECT_PLUGIN_PATH=/usr/share/java/kafka-connect/plugins
 
 # To isolate the classpath from the plugin path as recommended
 COPY --from=builder /code/kafka-connect-rest-source/build/third-party/*.jar ${CONNECT_PLUGIN_PATH}/kafka-connect-rest-source/