1
0
mirror of https://github.com/phusion/baseimage-docker.git synced 2026-03-26 12:29:07 +00:00

Compare commits

...

11 Commits

Author SHA1 Message Date
Jakob Ackermann
f69b7c63be Remove riscv64 from build platforms (#633)
The docker image `ubuntu:22.04` is not available for `riscv64`, which limits options for providing support for it here.
2024-02-16 13:12:41 +02:00
Nicolas Berens
a53fb9f863 disable e2fsprogs cron (#631)
* disable e2fsprogs cron
* fix linebreak

---------

Co-authored-by: Skyler Mäntysaari <samip5@users.noreply.github.com>
2024-01-16 16:48:50 +02:00
Arun Sathiya
a7cf854a73 ci: Use GITHUB_OUTPUT envvar instead of set-output command (#630) 2024-01-12 12:26:51 +02:00
Isaac To
d0cf8ac6f3 Update link to Docker hub and GHCR in README.md (#629)
* Update link to Docker hub in README.md
* Add link to image page in GHCR as well
2023-12-22 20:15:59 +02:00
Skyler Mäntysaari
cc3f8f6fc8 Create .github/FUNDING.yml 2023-03-24 03:44:47 +02:00
Skyler Mäntysaari
69afe4954c Merge pull request #615 from burgerrg/master
Update syslog-ng.conf for Ubuntu 22.04
2022-05-31 18:48:43 +03:00
Bob Burger
0b5441c268 Update syslog-ng.conf for Ubuntu 22.04 2022-05-31 11:32:15 -04:00
Skyler Mäntysaari
d2fbf3ad28 Merge pull request #614 from phusion/revert-613-jammy-patch-01
Revert "Added retreval of ubuntu key 871920D1991BC93C to apt keyring"
2022-05-23 23:38:59 +03:00
Skyler Mäntysaari
e2f180f35a Revert "Update prepare.sh (#613)"
This reverts commit aa4a3a5778.
2022-05-23 23:38:37 +03:00
Skyler Mäntysaari
aa4a3a5778 Update prepare.sh (#613)
Hopefully fix #612
2022-05-23 23:32:20 +03:00
Skyler Mäntysaari
29f719fe03 Image: Upgrade to Ubuntu 22.04. (#611) 2022-05-18 19:34:12 +03:00
6 changed files with 13 additions and 10 deletions

2
.github/FUNDING.yml vendored Normal file
View File

@@ -0,0 +1,2 @@
github: samip5
custom: https://www.buymeacoffee.com/skykrypt

View File

@@ -18,20 +18,20 @@ jobs:
DOCKER_IMAGE=phusion/baseimage
GIT_BRANCH=${GITHUB_REF##*/}
# Set the platforms to build for here and thus reduce duplicating it.
PLATFORMS=amd64,arm,arm64,riscv64
PLATFORMS=amd64,arm,arm64
TAGS="${DOCKER_IMAGE}:${GIT_BRANCH}, ghcr.io/${{ github.repository_owner }}/baseimage:${GIT_BRANCH}"
# Set output parameters.
if [ "${{github.event_name}}" == "pull_request" ]; then
echo ::set-output name=push::false
echo "push=false" >> $GITHUB_OUTPUT
else
echo ::set-output name=push::true
echo ::set-output name=tags::${TAGS}
echo ::set-output name=branch::${GIT_BRANCH}
echo ::set-output name=docker_image::${DOCKER_IMAGE}
echo "push=true" >> $GITHUB_OUTPUT
echo "tags=${TAGS}" >> $GITHUB_OUTPUT
echo "branch=${GIT_BRANCH}" >> $GITHUB_OUTPUT
echo "docker_image=${DOCKER_IMAGE}" >> $GITHUB_OUTPUT
fi
echo ::set-output name=platforms::${PLATFORMS}
echo "platforms=${PLATFORMS}" >> $GITHUB_OUTPUT
- name: Set up QEMU

View File

@@ -12,7 +12,7 @@ Baseimage-docker is a special [Docker](https://www.docker.com) image that is con
You can use it as a base for your own Docker images.
Baseimage-docker is available for pulling from [the Docker registry](https://registry.hub.docker.com/r/phusion/baseimage/)!
Baseimage-docker is available for pulling from [the Docker registry](https://hub.docker.com/r/phusion/baseimage) and [GHCR (GitHub Container Registry)](https://github.com/phusion/baseimage-docker/pkgs/container/baseimage)!
### What are the problems with the stock Ubuntu base image?

View File

@@ -1,4 +1,4 @@
ARG BASE_IMAGE=ubuntu:20.04
ARG BASE_IMAGE=ubuntu:22.04
FROM $BASE_IMAGE
ARG QEMU_ARCH

View File

@@ -17,3 +17,4 @@ rm -f /etc/cron.daily/upstart
rm -f /etc/cron.daily/dpkg
rm -f /etc/cron.daily/password
rm -f /etc/cron.weekly/fstrim
rm -f /etc/cron.d/e2scrub_all

View File

@@ -1,4 +1,4 @@
@version: 3.25
@version: 3.35
@include "scl.conf"
# Syslog-ng configuration file, compatible with default Debian syslogd