1
1
mirror of https://github.com/kokonect-link/cherrypick synced 2024-12-22 02:28:24 +09:00
Commit Graph

14 Commits

Author SHA1 Message Date
NoriDev
60d4a95040 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2023-12-01 16:01:16 +09:00
nullnyat
5cd4c36cad
rename docker-compose.yml.example to docker-compose_example.yml (#12530)
* rename docker-compose.yml.example to docker-compose_example.yml

* fix: dockle.yml
2023-12-01 11:19:33 +09:00
NoriDev
75c8632ab9 Merge remote-branch 'misskey/develop' 2023-10-19 20:03:08 +09:00
dependabot[bot]
3c3d05ba2e
chore(deps): bump actions/checkout from 4.1.0 to 4.1.1 (#12062)
Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4.1.0...v4.1.1)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-10-19 19:35:13 +09:00
NoriDev
34b134297f Merge remote-branch 'misskey/master' 2023-09-25 20:42:42 +09:00
dependabot[bot]
2039e244c5
build(deps): bump actions/checkout from 4.0.0 to 4.1.0 (#11900)
Bumps [actions/checkout](https://github.com/actions/checkout) from 4.0.0 to 4.1.0.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4.0.0...v4.1.0)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-09-25 16:05:02 +09:00
NoriDev
f0d6839d56 Merge remote-branch 'misskey/develop' 2023-09-06 16:41:26 +09:00
dependabot[bot]
c5af9e371c
build(deps): bump actions/checkout from 3.6.0 to 4.0.0 (#11786)
Bumps [actions/checkout](https://github.com/actions/checkout) from 3.6.0 to 4.0.0.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3.6.0...v4.0.0)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-09-05 17:15:53 +09:00
NoriDev
00f6cab00b Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2023-08-28 17:15:39 +09:00
dependabot[bot]
39eb86f5af
build(deps): bump actions/checkout from 3.5.3 to 3.6.0 (#11762)
Bumps [actions/checkout](https://github.com/actions/checkout) from 3.5.3 to 3.6.0.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3.5.3...v3.6.0)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-08-27 09:21:07 +09:00
NoriDev
6958bcf1a3 Merge remote-branch 'misskey/develop' 2023-08-16 17:13:56 +09:00
dependabot[bot]
f5985d53e5 build(deps): bump actions/checkout from 3.2.0 to 3.5.3
Bumps [actions/checkout](https://github.com/actions/checkout) from 3.2.0 to 3.5.3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3.2.0...v3.5.3)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-08-12 13:35:29 +02:00
NoriDev
9b9ff2056a Merge remote-branch 'upstream/master' 2023-02-06 03:25:40 +09:00
Masaya Suzuki
f599337320
DockleのCI追加 (#9568)
* Dockerイメージ検査のCI追加

* Add cp

* step分離

* step分離

* rm depends_on

* Dockle実行時に必要なイメージタグ付与処理をCI内で行う

* 末尾に移動

* Add comment

* .git削除処理をビルドステージに移動

* docker-compose.yml作成処理追加

* aptのキャッシュ削除処理追加

* ヘルスチェック用スクリプト追加

* yqインストール処理修正

* Add ca-certificates

* yqインストール処理をビルドステージに移動

* インデントを揃える

* インデントをタブに変更
2023-02-05 14:04:02 +09:00