Skip to content

Commit d9c9a66

Browse files
authored
feat: upgrade to Ionic v7.1.1 (#253)
* chore: upgrade github action versions * feat: upgrade Ionic to v7.1.1 * chore: upgrade license file * chore: update README * fix: use react type for ionic app * chore: update docker image build * chore: disable caching
1 parent 27badde commit d9c9a66

File tree

4 files changed

+13
-32
lines changed

4 files changed

+13
-32
lines changed

.github/workflows/docker.yml

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

1313
jobs:
1414
main:
15-
runs-on: ubuntu-20.04
15+
runs-on: ubuntu-22.04
1616
timeout-minutes: 30
1717
steps:
1818
- name: Check out the repo
@@ -25,43 +25,24 @@ 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 Docker Hub
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@v4
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-
# - name: Run Trivy vulnerability scanner
58-
# uses: aquasecurity/trivy-action@master
59-
# with:
60-
# image-ref: ${{ env.imageName }}:${{ steps.docker_meta.outputs.version }}
61-
# format: "template"
62-
# template: "@/contrib/sarif.tpl"
63-
# output: "trivy-results.sarif"
64-
# - name: Upload Trivy scan results to GitHub Security tab
65-
# uses: github/codeql-action/upload-sarif@v1
66-
# with:
67-
# sarif_file: "trivy-results.sarif"
48+

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
FROM beevelop/cordova
22

3-
ENV IONIC_VERSION 6.16.1
3+
ENV IONIC_VERSION 7.1.1
44

55
RUN apt-get update && apt-get install -y git bzip2 openssh-client && \
66
npm install -g --unsafe-perm @ionic/cli@${IONIC_VERSION} && \
77
ionic --version && \
88
cd /tmp && \
9-
ionic start myNewProject blank --type=ionic-angular --capacitor && \
9+
ionic start myNewProject blank --type=react --capacitor && \
1010
cd myNewProject && \
1111
ionic build && \
1212
ionic capacitor build android --no-open && \

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) 2015-2021 Maik Hummel
3+
Copyright (c) 2015-2023 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: 2 additions & 2 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-ionic/Docker%20Image?style=for-the-badge)
1+
![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/beevelop/docker-ionic/docker.yml?style=for-the-badge)
22
![Docker Pulls](https://img.shields.io/docker/pulls/beevelop/ionic.svg?style=for-the-badge)
33
![Docker Stars](https://img.shields.io/docker/stars/beevelop/ionic?style=for-the-badge)
44
![Docker Image Size (tag)](https://img.shields.io/docker/image-size/beevelop/ionic/latest?style=for-the-badge)
@@ -10,7 +10,7 @@
1010

1111
# Latest Ionic
1212

13-
### based on the latest Cordova with Android `11` and Node.js `14`
13+
### based on the latest Cordova with Android `13` and Node.js `v18`
1414

1515
---
1616

0 commit comments

Comments
 (0)