Skip to content

Commit aa1b875

Browse files
committed
feat: update for 2025
1 parent 33e71c6 commit aa1b875

File tree

5 files changed

+35
-27
lines changed

5 files changed

+35
-27
lines changed

.github/dependabot.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
interval: "daily"
7+
open-pull-requests-limit: 1
8+
groups:
9+
github-actions:
10+
patterns:
11+
- "*"
12+
- package-ecosystem: "docker"
13+
directory: "/"
14+
schedule:
15+
interval: "daily"
16+
open-pull-requests-limit: 1
17+
groups:
18+
docker:
19+
patterns:
20+
- "*"

.github/workflows/docker.yml

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ env:
1212

1313
jobs:
1414
main:
15-
runs-on: ubuntu-20.04
15+
runs-on: ubuntu-latest
1616
timeout-minutes: 30
1717
steps:
1818
- name: Check out the repo
19-
uses: actions/checkout@v3
19+
uses: actions/checkout@v4
2020
- name: Set imageName based on the repository name
2121
id: step_one
2222
run: |
@@ -25,15 +25,15 @@ jobs:
2525
echo "imageName=$imageName" >> $GITHUB_ENV
2626
- name: Docker meta
2727
id: docker_meta
28-
uses: docker/metadata-action@v4
28+
uses: docker/metadata-action@v5
2929
with:
3030
images: ${{ env.imageName }}
3131
- name: Set up QEMU
32-
uses: docker/setup-qemu-action@v2
32+
uses: docker/setup-qemu-action@v3
3333
- name: Set up Docker Buildx
34-
uses: docker/setup-buildx-action@v2
35-
- name: Login to Harbor
36-
uses: docker/login-action@v2
34+
uses: docker/setup-buildx-action@v3
35+
- name: Login to DockerHub
36+
uses: docker/login-action@v3
3737
with:
3838
username: ${{ secrets.DOCKERHUB_USERNAME }}
3939
password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -46,23 +46,9 @@ jobs:
4646
# ${{ runner.os }}-docker
4747
- name: Build and push
4848
id: docker_build
49-
uses: docker/build-push-action@v4
49+
uses: docker/build-push-action@v5
5050
with:
5151
platforms: ${{ env.platforms }}
5252
push: ${{ github.event_name != 'pull_request' }}
5353
tags: ${{ steps.docker_meta.outputs.tags }}
5454
labels: ${{ steps.docker_meta.outputs.labels }}
55-
# cache-from: type=local,src=${{ github.workspace }}/cache
56-
# cache-to: type=local,dest=${{ github.workspace }}/cache
57-
# temporarily disabled until https://github.com/aquasecurity/trivy-action/issues/22 is resolved
58-
# - name: Run Trivy vulnerability scanner
59-
# uses: aquasecurity/trivy-action@master
60-
# with:
61-
# image-ref: ${{ env.imageName }}:${{ steps.docker_meta.outputs.version }}
62-
# format: "template"
63-
# template: "@/contrib/sarif.tpl"
64-
# output: "trivy-results.sarif"
65-
# - name: Upload Trivy scan results to GitHub Security tab
66-
# uses: github/codeql-action/upload-sarif@v1
67-
# with:
68-
# sarif_file: "trivy-results.sarif"

Dockerfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
FROM beevelop/android-nodejs
22

3-
ENV CORDOVA_VERSION=12.0.0 \
4-
CORDOVA_BUILD_TOOLS_VERSION=33.0.2 \
3+
ENV CORDOVA_VERSION=13.0.0 \
4+
CORDOVA_BUILD_TOOLS_VERSION=34.0.0 \
55
ANDROID_HOME=/opt/android
66

77
WORKDIR "/tmp"
88

9+
# Install build tools and Cordova, then test build to verify setup
910
RUN while true; do echo 'y'; sleep 2; done | sdkmanager "build-tools;${CORDOVA_BUILD_TOOLS_VERSION}" && \
1011
npm i -g --unsafe-perm cordova@${CORDOVA_VERSION} && \
1112
cordova -v && \
@@ -17,4 +18,5 @@ RUN while true; do echo 'y'; sleep 2; done | sdkmanager "build-tools;${CORDOVA_B
1718
cordova requirements android && \
1819
cordova build android --verbose && \
1920
rm -rf /tmp/myApp && \
20-
rm -rf /opt/android/licenses
21+
rm -rf /opt/android/licenses && \
22+
npm cache clean --force

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2016-2023 Maik Hummel
3+
Copyright (c) 2016-2025 Maik Hummel
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
![CalVer](https://img.shields.io/badge/CalVer-YYYY.MM.MICRO-22bfda.svg?style=for-the-badge)
99
[![Beevelop](https://img.shields.io/badge/-%20Made%20with%20%F0%9F%8D%AF%20by%20%F0%9F%90%9Dvelop-blue.svg?style=for-the-badge)](https://beevelop.com)
1010

11-
# Cordova 12
11+
# Cordova 13
1212

1313
### based on [beevelop/android-nodejs](https://github.com/beevelop/docker-android-nodejs)
1414

0 commit comments

Comments
 (0)