Skip to content

Commit

Permalink
Merge pull request #235 from compose-generator/release/v1.4.x
Browse files Browse the repository at this point in the history
Release of version 1.4.0
  • Loading branch information
marcauberer committed Nov 29, 2021
2 parents 3d61be3 + d890f94 commit 412d85b
Show file tree
Hide file tree
Showing 43 changed files with 333 additions and 141 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ body:
example:
- **OS**: Ubuntu 20.04
- **Installation method**: APT package manager
- **Compose Generator version**: 1.2.1
- **Compose Generator version**: 1.4.0
value: |
- OS:
- Installation method:
Expand Down
8 changes: 4 additions & 4 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ updates:
time: "04:00"
timezone: Europe/Berlin
open-pull-requests-limit: 15
target-branch: release/v1.4.x
target-branch: release/v1.5.x
reviewers:
- marcauberer
assignees:
Expand All @@ -22,7 +22,7 @@ updates:
time: "04:00"
timezone: Europe/Berlin
open-pull-requests-limit: 15
target-branch: release/v1.4.x
target-branch: release/v1.5.x
reviewers:
- marcauberer
assignees:
Expand All @@ -36,7 +36,7 @@ updates:
time: "04:00"
timezone: Europe/Berlin
open-pull-requests-limit: 15
target-branch: release/v1.4.x
target-branch: release/v1.5.x
reviewers:
- marcauberer
assignees:
Expand All @@ -50,7 +50,7 @@ updates:
time: "04:00"
timezone: Europe/Berlin
open-pull-requests-limit: 15
target-branch: release/v1.4.x
target-branch: release/v1.5.x
reviewers:
- marcauberer
assignees:
Expand Down
4 changes: 2 additions & 2 deletions .github/scripts/service-tester/predefined-service-tester.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ def get_all_template_names():

template_tuples = []
template_types = ["backend", "database", "db-admin", "frontend"]
skipped_names = ["rocket", "faunadb", "gitea",
"gitlab", "adguard-home", "pi-hole"]
skipped_names = ["rocket", "faunadb", "gitea", "spring-gradle",
"gitlab", "adguard-home", "pi-hole", "vue", "live-poll"]
for template_type in template_types:
template_type_path = TEMPLATES_PATH + '/' + template_type
services = [f for f in listdir(template_type_path) if isdir(
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
- name: Run GoReleaser
uses: goreleaser/goreleaser-action@v2
with:
version: v1.0.0
version: v1.1.0
args: release --rm-dist
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
10 changes: 7 additions & 3 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -222,15 +222,19 @@ nfpms:
type: symlink
- src: bash_autocomplete.sh
dst: /etc/bash_completion.d/compose-generator
empty_folders:
- /usr/lib/compose-generator/templates
- /usr/lib/compose-generator/log
- dst: /usr/lib/compose-generator/templates
type: dir
- dst: /var/log/compose-generator
type: dir
release:
name_template: v{{ .Tag }}
prerelease: auto
extra_files:
- glob: ./predefined-services/predefined-services.tar.gz
footer: |
**Full Changelog**: https://github.com/compose-generator/compose-generator/compare/{{ .PreviousTag }}...{{ .Tag }}
## What to do next?
- [Install Compose Generator](https://www.compose-generator.com/install/linux/)
- Visit [www.compose-generator.com](https://www.compose-generator.com) to test the new features
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# WARNING: This Dockerfile is not meant to be used to build the Docker image manually
FROM alpine:3.14
FROM alpine:3.15

# Set env variables
ENV PATH="/cg:${PATH}"
Expand Down Expand Up @@ -31,4 +31,4 @@ COPY predefined-services/ /cg/predefined-services/
RUN chmod +x /cg/cg

# Set entrypoint
ENTRYPOINT [ "cg" ]
ENTRYPOINT [ "cg" ]
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ There are downloadable packages available for all supported platforms:
| **Windows Portable (zip)** | [download](https://github.com/compose-generator/compose-generator/releases/latest/download/compose-generator_windows_amd64.zip) | [download](https://github.com/compose-generator/compose-generator/releases/latest/download/compose-generator_windows_386.zip) | - | - | - | - |

## Contribute by providing predefined templates
If you miss a predefined template and you want to create one for the public, please read the [instructions to create a template](./predefined-services/README.md). Fork the repository, create the template and open a pr against the `release/v1.4.x` branch.
If you miss a predefined template and you want to create one for the public, please read the [instructions to create a template](./predefined-services/README.md). Fork the repository, create the template and open a pr against the `release/v1.5.x` branch.
The community is thankful for every predefined template!

## Contribute otherwise to the project
Expand Down

0 comments on commit 412d85b

Please sign in to comment.