Skip to content

Commit d6e3eb7

Browse files
authored
feat: update all assets (#344)
* feat: update all assets * chore: update README * chore: update CI config * chore: update README * chore: update CI pipeline
1 parent d655de0 commit d6e3eb7

File tree

4 files changed

+40
-41
lines changed

4 files changed

+40
-41
lines changed

.github/workflows/docker.yml

Lines changed: 22 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
timeout-minutes: 30
1717
steps:
1818
- name: Check out the repo
19-
uses: actions/checkout@v2
19+
uses: actions/checkout@v3
2020
- name: Set imageName based on the repository name
2121
id: step_one
2222
run: |
@@ -25,44 +25,38 @@ jobs:
2525
echo "imageName=$imageName" >> $GITHUB_ENV
2626
- name: Docker meta
2727
id: docker_meta
28-
uses: crazy-max/ghaction-docker-meta@v1
28+
uses: docker/metadata-action@v4
2929
with:
3030
images: ${{ env.imageName }}
3131
- name: Set up QEMU
32-
uses: docker/setup-qemu-action@v1
32+
uses: docker/setup-qemu-action@v2
3333
- name: Set up Docker Buildx
34-
uses: docker/setup-buildx-action@v1
35-
- name: Login to Harbor
36-
uses: docker/login-action@v1
34+
uses: docker/setup-buildx-action@v2
35+
- name: Login to DockerHub
36+
uses: docker/login-action@v2
3737
with:
3838
username: ${{ secrets.DOCKERHUB_USERNAME }}
3939
password: ${{ secrets.DOCKERHUB_TOKEN }}
40-
- name: Buildx cache
41-
uses: actions/cache@v1
42-
with:
43-
path: ${{ github.workspace }}/cache
44-
key: ${{ runner.os }}-docker-${{ hashfiles('cache/**') }}
45-
restore-keys: |
46-
${{ runner.os }}-docker
4740
- name: Build and push
4841
id: docker_build
49-
uses: docker/build-push-action@v2
42+
uses: docker/build-push-action@v3
5043
with:
5144
platforms: ${{ env.platforms }}
5245
push: ${{ github.event_name != 'pull_request' }}
5346
tags: ${{ steps.docker_meta.outputs.tags }}
5447
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"
48+
- name: Run Trivy vulnerability scanner
49+
uses: aquasecurity/trivy-action@master
50+
with:
51+
image-ref: ${{ env.imageName }}:${{ steps.docker_meta.outputs.version }}
52+
format: 'sarif'
53+
output: 'trivy-results.sarif'
54+
ignore-unfixed: true
55+
vuln-type: 'os,library'
56+
security-checks: 'vuln'
57+
severity: 'CRITICAL,HIGH'
58+
timeout: '10m0s'
59+
- name: Upload Trivy scan results to GitHub Security tab
60+
uses: github/codeql-action/upload-sarif@v2
61+
with:
62+
sarif_file: "trivy-results.sarif"

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ FROM beevelop/android
33
RUN apt-get update && apt-get install -y curl gnupg2 lsb-release && \
44
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
55
apt-key fingerprint 1655A0AB68576280 && \
6-
export VERSION=node_14.x && \
6+
export VERSION=node_16.x && \
77
export DISTRO="$(lsb_release -s -c)" && \
88
echo "deb https://deb.nodesource.com/$VERSION $DISTRO main" | tee /etc/apt/sources.list.d/nodesource.list && \
99
echo "deb-src https://deb.nodesource.com/$VERSION $DISTRO main" | tee -a /etc/apt/sources.list.d/nodesource.list && \

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-2021 Maik Hummel (beevelop)
3+
Copyright (c) 2016-2023 Maik Hummel (beevelop)
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: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
![GitHub Workflow Status](https://img.shields.io/github/workflow/status/beevelop/docker-android-nodejs/Docker%20Image?style=for-the-badge)
1+
![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/beevelop/docker-android-nodejs/docker.yml?style=for-the-badge)
22
![Docker Pulls](https://img.shields.io/docker/pulls/beevelop/android-nodejs.svg?style=for-the-badge)
33
![Docker Stars](https://img.shields.io/docker/stars/beevelop/android-nodejs?style=for-the-badge)
44
![Docker Image Size (tag)](https://img.shields.io/docker/image-size/beevelop/android-nodejs/latest?style=for-the-badge)
@@ -8,29 +8,34 @@
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-
# Android 11 with Node.js `v14` and npm / yarn
11+
# Android 13 with Node.js `v16` and npm / yarn
1212

1313
### based on [beevelop/android](https://github.com/beevelop/docker-android)
14-
- Java 8 (OpenJDK 1.8.0_282)
15-
- Gradle 4.4.1 (Groovy: 2.4.16)
16-
- Apache Maven 3.6.3
17-
- Ant 1.10.7
14+
15+
- Java `11.0.17`
16+
- Gradle `4.4.1` (Groovy: `2.4.17`)
17+
- Apache Maven `3.6.3`
18+
- Ant `1.10.7`
19+
- Node.js `v16.19.0`
20+
- npm `8.19.3`
1821

1922
### Pull, build or run this image
23+
2024
```bash
2125
# pull the most recent tag / release
22-
docker pull beevelop/android-nodejs:v2021.06.1
26+
docker pull beevelop/android-nodejs:v2023.01.1
2327

2428
# or run the image interactively
25-
docker run --rm --name beevelop -it beevelop/android-nodejs:v2021.06.1 bash
29+
docker run --rm --name beevelop -it beevelop/android-nodejs:v2023.01.1 bash
2630

2731
# or build the image from GitHub
2832
docker build -t beevelop/android-nodejs github.com/beevelop/docker-base
2933
```
3034

31-
### Or use as base image
35+
### Or use it as a base image
36+
3237
```Dockerfile
33-
FROM beevelop/android-nodejs:v2021.06.1
38+
FROM beevelop/android-nodejs:v2023.01.1
3439
```
3540

3641
---
@@ -39,6 +44,6 @@ FROM beevelop/android-nodejs:v2021.06.1
3944

4045
---
4146

42-
### Use tags where possible, because...
47+
### Use tags where possible, because
4348

4449
![One does not simply use latest](https://i.imgflip.com/1fgwxr.jpg)

0 commit comments

Comments
 (0)