Commit graph

6 commits

Author SHA1 Message Date
Claire
aaace9f1db Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `CHANGELOG.md`:
  Upstream added newlines.
  Conflicts are because the CHANGELOG was independently merged from 3.4.6 on
  last security update.
  Took upstream's version.
- `app/helpers/context_helper.rb`:
  Conflicts because of extra vocabulary in glitch-soc. The conflicts were
  actually handled in last security merge.
  Kept our version.
2022-02-06 15:34:42 +01:00
potpro
3050472467 Update build-image.yml (#17454) 2022-02-05 17:29:54 +01:00
Claire
b3d1cf4cfe Revert "Change workflow to push to Docker Hub (#16980)"
This reverts commit fc187cefdf.
2021-12-18 12:47:57 +01:00
Eugen Rochko
c32e5f820d Add manual GitHub Actions runs (#17000) 2021-11-16 21:42:14 +01:00
Eugen Rochko
fc187cefdf Change workflow to push to Docker Hub (#16980) 2021-11-14 06:11:05 +01:00
Yusuke Nakamura
786e5e634c Build container image by GitHub Actions (#16973)
* Build container image by GitHub Actions

* Trigger docker build only pushed to main branch

* Tweak tagging imgae

- "edge" is the main branch
- "latest" is the tagged latest release
2021-11-12 05:18:29 +01:00