Skip to content

Commit

Permalink
Bumped galette version to 1.0.4. Minor readme and contribution updates
Browse files Browse the repository at this point in the history
  • Loading branch information
grasdk committed Apr 25, 2024
1 parent b3b2f7e commit 84a7de1
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 21 deletions.
6 changes: 4 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,15 @@ Although it's possible to build packages without `dockerd` running, using [`buil

### Building the docker image locally
1. Start the docker daemon if it's not already started: `sudo dockerd`
2. Run the build command: `docker buildx build -t galette-local .`
2. Run the build command: `docker buildx build --platform linux/amd64 -t galette-local --load .`
* replace the platform (`linux/amd64`) if you're building on another platform
* replace `galette-local` with any name you would like to give your local image
* `--load` loads the image into your local docker, so you can use it as a container image.

### Building for multiple architecures locally
1. Start the docker daemon if it's not already started: `sudo dockerd`
2. Create a builder-image `docker buildx create --name mybuilder --use --bootstrap` (see "Building with Buildx" [here](https://www.docker.com/blog/how-to-rapidly-build-multi-architecture-images-with-buildx/) for more details)
3. Run the build command: `docker buildx build --platform linux/amd64,linux/arm64 -t galette-local .`
3. Run the build command: `docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 -t galette-local .`
* replace `galette-local` with any name you would like to give your local image
* NOTE: The build process is significantly longer than just building for your local architecture.

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ LABEL maintainer="GrasDK"
# @author GrasDK

LABEL phpversion="8.2"
ARG galetteversion="1.0.3"
ARG galetteversion="1.0.4"

## Plugins versions
ARG plugin_auto_version="2.0.0"
Expand Down
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,15 @@ If you want to contribute to containerized galette, take a look [here](./CONTRIB
* only webroot is exposed via Apache DocumentRoot and vhost
* you can use reverse proxy to access Galette by domain or subdomain

## Prerequisites
This docker image has no included database, so you need to have that separately. Since you probably already are running docker, take a look [here](https://mariadb.com/kb/en/installing-and-using-mariadb-via-docker/#creating-a-container) for a guide on how to run MariaDB in a container.

## How to use this image using docker command line
Galette has a really nice installer, that runs you through database setup and initial admin user creation. The installer creates a configuration files, which you will be interested in keeping on a volume outside the docker image, for reuse when you upgrade to a newer version.

Therefore it is really important that you follow this guide exactly.

If you are upgrading from an ealier version, you can skip the first step below.
If you are upgrading from an ealier version, you can skip the first two steps below.

1. Create an empty file `config.inc.php` which you will mount as a volume in the next step.
- It is important that you create this file. You can also take a copy of [this](.example/config/config.inc.php), as the contents do not matter
Expand Down
17 changes: 0 additions & 17 deletions galette-with-db.Dockerfile

This file was deleted.

0 comments on commit 84a7de1

Please sign in to comment.