Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update custom-image app to support bullseye #26

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions custom-image/.actdk/dependencies.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,10 @@
"apt": [],
"pip": [],
"base_image": "hoge"
},
"raspberrypi-bullseye": {
"apt": [],
"pip": [],
"base_image": "hoge"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hogeだと何もわからないので、別の名前に変えたほうがいいと思います

}
}
5 changes: 4 additions & 1 deletion custom-image/.actdk/setting.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,8 @@
"app_server_id": 1,
"short_description": null,
"short_descriptions": {},
"target_types": ["raspberrypi-buster"]
"target_types": [
"raspberrypi-buster",
"raspberrypi-bullseye"
]
}
4 changes: 2 additions & 2 deletions custom-image/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Stage 1: Build Python
FROM idein/actcast-rpi-app-base:bullseye-1 as base
FROM idein/actcast-rpi-app-base:bullseye-3 as base

# このステージのスクリプトは、
# https://github.com/docker-library/python/blob/master/3.12/slim-bullseye/Dockerfile
Expand Down Expand Up @@ -33,7 +33,7 @@ RUN set -eux; \
savedAptMark="$(apt-mark showmanual)"; \
apt-get update; \
# workaround: tk-dev だけ別にしないとインストールに失敗する
apt-get install -y --no-install-recommends tk-dev; \
apt-get install -y --no-install-recommends tk-dev; \
apt-get install -y --no-install-recommends \
dpkg-dev \
gcc \
Expand Down
4 changes: 2 additions & 2 deletions custom-image/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Custom Image Example

**※このサンプルアプリケーションは ActcastOS 3 に対応していません。こちらを参考にアプリケーションを実装する場合、[ActcastOS 3 Migration ガイド](https://actcast.io/docs/ja/ApplicationDevelopment/ForActcastOS3/) に従って Actcast OS 3 に対応させてください**
**※このサンプルアプリケーションはActcastOS 3 に対応しています**

## 概要

Expand All @@ -17,7 +17,7 @@ Python 3.12 をインストールしたイメージをビルドし、そのイ

## ベースイメージのビルド方法

> [!NOTE]
> [!NOTE]
> ベースイメージ `ghcr.io/idein/custom-image-example` は予め公開されているため、動作確認のために改めてビルドする必要はありません。

```bash
Expand Down
16 changes: 16 additions & 0 deletions custom-image/manifesto/bullseye.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"version": 2,
"target_type": "raspberrypi-bullseye",
"boards": [
"RSPiZero2W",
"RSPi2B",
"RSPi3APlus",
"RSPi3B",
"RSPi3BPlus",
"RSPiCM3",
"RSPiCM3Plus",
"RSPi4B",
"RSPiCM4"
],
"devices": []
}
File renamed without changes.