Skip to content

Commit 7497df2

Browse files
author
Maik Hummel
committed
Update image
1 parent a924e98 commit 7497df2

File tree

5 files changed

+88
-22
lines changed

5 files changed

+88
-22
lines changed

.github/workflows/docker.yml

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
name: Docker Image
2+
3+
on:
4+
schedule:
5+
- cron: "0 14 * * *" # everyday at 2pm
6+
push:
7+
branches: ["**"]
8+
tags: ["v*.*.*"]
9+
10+
env:
11+
platforms: linux/amd64
12+
13+
jobs:
14+
main:
15+
runs-on: ubuntu-20.04
16+
timeout-minutes: 20
17+
steps:
18+
- name: Check out the repo
19+
uses: actions/checkout@v2
20+
- name: Set imageName based on the repository name
21+
id: step_one
22+
run: |
23+
imageName="${GITHUB_REPOSITORY/docker-/}"
24+
echo $imageName
25+
echo "imageName=$imageName" >> $GITHUB_ENV
26+
- name: Docker meta
27+
id: docker_meta
28+
uses: crazy-max/ghaction-docker-meta@v1
29+
with:
30+
images: ${{ env.imageName }}
31+
- name: Set up QEMU
32+
uses: docker/setup-qemu-action@v1
33+
- name: Set up Docker Buildx
34+
uses: docker/setup-buildx-action@v1
35+
- name: Login to Harbor
36+
uses: docker/login-action@v1
37+
with:
38+
username: ${{ secrets.DOCKERHUB_USERNAME }}
39+
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
47+
- name: Build and push
48+
id: docker_build
49+
uses: docker/build-push-action@v2
50+
with:
51+
platforms: ${{ env.platforms }}
52+
push: ${{ github.event_name != 'pull_request' }}
53+
tags: ${{ steps.docker_meta.outputs.tags }}
54+
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"

.travis.yml

Lines changed: 0 additions & 8 deletions
This file was deleted.

Dockerfile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ LABEL maintainer="Maik Hummel <[email protected]>" \
2525
org.opencontainers.image.source="https://github.com/beevelop/docker-android-nodejs.git"
2626

2727
# Source of the following lines (all rights belong to the Node.js contributors)
28-
# https://github.com/nodejs/docker-node/blob/master/12/stretch-slim/Dockerfile
28+
# https://github.com/nodejs/docker-node/blob/master/14/buster-slim/Dockerfile
2929
# LICENSE: MIT (see https://github.com/nodejs/docker-node/blob/master/LICENSE)
3030
RUN groupadd --gid 1000 node \
3131
&& useradd --uid 1000 --gid node --shell /bin/bash --create-home node
3232

33-
ENV NODE_VERSION 12.16.1
33+
ENV NODE_VERSION 14.15.5
3434

3535
RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
3636
&& case "${dpkgArch##*-}" in \
@@ -47,16 +47,16 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
4747
&& apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr xz-utils libatomic1 --no-install-recommends \
4848
&& rm -rf /var/lib/apt/lists/* \
4949
&& for key in \
50+
4ED778F539E3634C779C87C6D7062848A1AB005C \
5051
94AE36675C464D64BAFA68DD7434390BDBE9B9C5 \
51-
FD3A5288F042B6850C66B31F09FE44734EB7990E \
52+
74F12602B6F1C4E913FAA37AD3A89613643B6201 \
5253
71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 \
53-
DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
54-
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
55-
B9AE9905FFD7803F25714661B63B535A4C206CA9 \
56-
77984A986EBC2AA786BC0F66B01FBB92821C587A \
5754
8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \
58-
4ED778F539E3634C779C87C6D7062848A1AB005C \
55+
C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 \
56+
C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \
57+
DD8F2338BAE7501E3DD5AC78C273792F7D83545D \
5958
A48C2BEE680E841632CD4E44F07496B3EB3C1762 \
59+
108F52B48DB57BB0CC439B2997B01419BD92F80A \
6060
B9E2F5981AA6E0CD28160D9FF13993A75599653C \
6161
; do \
6262
gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" || \
@@ -83,7 +83,7 @@ RUN ARCH= && dpkgArch="$(dpkg --print-architecture)" \
8383
&& node --version \
8484
&& npm --version
8585

86-
ENV YARN_VERSION 1.22.0
86+
ENV YARN_VERSION 1.22.5
8787

8888
RUN set -ex \
8989
&& savedAptMark="$(apt-mark showmanual)" \

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-2020 Maik Hummel (beevelop)
3+
Copyright (c) 2016-2021 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: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,39 @@
1-
[![Travis](https://shields.beevelop.com/travis/beevelop/docker-nodejs.svg?style=flat-square)](https://travis-ci.org/beevelop/docker-nodejs)
21
[![Pulls](https://shields.beevelop.com/docker/pulls/beevelop/nodejs.svg?style=flat-square)](https://links.beevelop.com/d-nodejs)
32
[![Size](https://shields.beevelop.com/docker/image/size/beevelop/nodejs/latest.svg?style=flat-square)](https://links.beevelop.com/d-nodejs)
43
[![Layers](https://shields.beevelop.com/docker/image/layers/beevelop/nodejs/latest.svg?style=flat-square)](https://links.beevelop.com/d-nodejs)
54
![Badges](https://shields.beevelop.com/badge/badges-7-brightgreen.svg?style=flat-square)
65
[![Beevelop](https://links.beevelop.com/honey-badge)](https://beevelop.com)
76

8-
# Android Q (10) with Node.js `v12` and npm / yarn
7+
# Android 11 with Node.js `v14` and npm / yarn
8+
99
### based on [beevelop/android](https://github.com/beevelop/docker-android)
10-
----
10+
11+
---
12+
1113
### Pull from Docker Hub
14+
1215
```
1316
docker pull beevelop/android-nodejs:latest
1417
```
1518

1619
### Build from GitHub
20+
1721
```
1822
docker build -t beevelop/android-nodejs github.com/beevelop/docker-android-nodejs
1923
```
2024

2125
### Run image
26+
2227
```
2328
docker run -it beevelop/android-nodejs bash
2429
```
2530

2631
### Use as base image
32+
2733
```Dockerfile
2834
FROM beevelop/android-nodejs:latest
2935
```
3036

31-
----
37+
---
3238

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

0 commit comments

Comments
 (0)