Skip to content

Commit

Permalink
Merge pull request #793 from weseek/master
Browse files Browse the repository at this point in the history
Release v0.3.0
  • Loading branch information
ryu-sato authored Feb 16, 2025
2 parents 76da048 + 0e11f4e commit 9373627
Show file tree
Hide file tree
Showing 46 changed files with 1,906 additions and 1,207 deletions.
10 changes: 5 additions & 5 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

# You must set same Node.js version and Linux distribution as docker/Dockerfile
# [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 16, 14, 12, 16-bullseye, 14-bullseye, 12-bullseye, 16-buster, 14-buster, 12-buster
ARG VARIANT="16"
FROM mcr.microsoft.com/vscode/devcontainers/typescript-node:0-${VARIANT}
ARG VARIANT="22"
FROM mcr.microsoft.com/vscode/devcontainers/typescript-node:dev-${VARIANT}-bullseye

# [Optional] Uncomment this section to install additional OS packages.
# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
Expand All @@ -30,9 +30,9 @@ RUN if [ "$USER_GID" != "1000" ] || [ "$USER_UID" != "1000" ]; then \
RUN chown -R $USER_UID:$USER_GID /home/$USERNAME /awesome-database-backup;

# Install tools
ARG MongoToolVersion=100.5.2
ARG PostgreSQLClientVersion=11
ARG MariaDBClientVersion=10.5.28
ARG MongoToolVersion=100.10.0
ARG PostgreSQLClientVersion=17
ARG MariaDBClientVersion=11.7.2
## bzip2, curl command
RUN apt-get update \
&& apt-get install -y bzip2 curl \
Expand Down
12 changes: 6 additions & 6 deletions .devcontainer/compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ services:
# db_tool_version: 100.5.2
# - db_type: mongodb
# db_tool_version: 100.5.3
image: mongo:6
image: mongo:8
environment:
MONGO_INITDB_ROOT_USERNAME: ${DB_ADMIN_USERNAME:-root}
MONGO_INITDB_ROOT_PASSWORD: ${DB_ADMIN_PASSWORD:-password}
Expand All @@ -49,7 +49,7 @@ services:
# db_tool_version: 11
# - db_type: postgresql
# db_tool_version: 12
image: postgres:11-bullseye
image: postgres:17-bullseye
environment:
POSTGRES_DB: ${DB_NAME:-test}
POSTGRES_PASSWORD: ${DB_ADMIN_PASSWORD:-password}
Expand All @@ -68,7 +68,7 @@ services:
# db_tool_version: 10.5.28
# - db_type: mariadb
# db_tool_version: 10.6.21
image: mariadb:10.5.28
image: mariadb:11.7.2
environment:
MARIADB_USER: ${DB_ADMIN_USERNAME:-root}
MARIADB_ROOT_PASSWORD: ${DB_ADMIN_PASSWORD:-password}
Expand All @@ -77,15 +77,15 @@ services:
healthcheck:
test:
- CMD
- mysqladmin
- mariadb-admin
- ping
- -h
- localhost
- -p${DB_ADMIN_PASSWORD:-password}

# S3 Mock for test
minio:
image: minio/minio:RELEASE.2022-04-09T15-09-52Z
image: minio/minio:RELEASE.2025-02-07T23-21-09Z
environment:
MINIO_ACCESS_KEY: minioadmin
MINIO_SECRET_KEY: minioadmin
Expand All @@ -103,7 +103,7 @@ services:

# GCS Mock for test
fake-gcs-server:
image: fsouza/fake-gcs-server:1.37.3
image: fsouza/fake-gcs-server:1.52.1
volumes:
- fake-gcs-server:/data
command:
Expand Down
28 changes: 5 additions & 23 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@ updates:
commit-message:
prefix: ci
include: scope
ignore:
# See: https://github.com/bakunyo/git-pr-release-action/issues/15, https://github.com/samunohito/SimpleVolumeMixer/commit/2059044c71236509466cf9b1bb2d56d515274938
- dependency-name: bakunyo/git-pr-release-action
labels:
- github-actions
- type/dependencies
Expand All @@ -30,23 +27,8 @@ updates:
- type/dependencies

# Docker
- package-ecosystem: docker
directory: /.devcontainer/
schedule:
interval: daily
commit-message:
prefix: ci
include: scope
labels:
- docker
- type/dependencies
- package-ecosystem: docker
directory: /docker/
schedule:
interval: daily
commit-message:
prefix: ci
include: scope
labels:
- docker
- type/dependencies
# [MEMO]
# It is difficult to align Node.js versions using only dependabot because
# the base image differs between the development and production environments.
# Therefore, the policy is not to update by dependabot, but to update by hand.
# see. https://github.com/weseek/awesome-database-backup/wiki/Node.js,-yarn-%E3%82%A2%E3%83%83%E3%83%97%E3%83%87%E3%83%BC%E3%83%88%E6%96%B9%E6%B3%95-(%E3%83%A1%E3%83%B3%E3%83%86%E3%83%8A%E3%83%BC%E5%90%91%E3%81%91)
2 changes: 1 addition & 1 deletion .github/workflows/app-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: "16.14.2"
node-version-file: package.json
cache: "yarn"
- run: yarn install
- run: yarn build
2 changes: 1 addition & 1 deletion .github/workflows/app-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: "16.14.2"
node-version-file: package.json
cache: "yarn"
- run: yarn install
- run: yarn run lint
9 changes: 8 additions & 1 deletion .github/workflows/app-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,12 @@ jobs:
docker compose -f .devcontainer/compose.yml up -d
- name: Run test
run:
docker compose -f .devcontainer/compose.yml exec -T -- node bash -c 'yarn install && yarn test'
docker compose -f .devcontainer/compose.yml exec -e NODE_OPTIONS -T -- node bash -c 'yarn install && yarn test'
env:
# Temporarily ignore warnings
# see:
# * https://github.com/nodejs/node/blob/59cdd4f1c246cceb89a00c37e3c819a08444c888/doc/api/deprecations.md#dep0040-nodepunycode-module
# * https://github.com/nodejs/node/pull/56632
NODE_OPTIONS: --no-deprecation

# [TODO] Coverage report
13 changes: 7 additions & 6 deletions .github/workflows/container-publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,12 @@ jobs:
# awesome-mariadb-backup
# Valid versions can be found here https://dlm.mariadb.com/rest/releases/mariadb_server/
- db_type: mariadb
version: 10.5.28
version: 11.4.5
- db_type: mariadb
version: 10.6.21
version: 11.7.2
- db_type: mariadb
version: 10.11.11
version: 11.8.1
isLatest: true
# awesome-file-backup
- db_type: file
isLatest: true
Expand All @@ -64,7 +65,7 @@ jobs:
- name: Set up metadata
id: pkg_meta
run: |
echo "package_scope=@awesome-database-backup/awesome-${{ matrix.db_tool.db_type }}-backup" >> $GITHUB_OUTPUT
echo "package_filter=@awesome-database-backup/awesome-${{ matrix.db_tool.db_type }}-backup" >> $GITHUB_OUTPUT
echo "package_path=apps/awesome-${{ matrix.db_tool.db_type }}-backup" >> $GITHUB_OUTPUT
echo "package_repository=weseek/awesome-${{ matrix.db_tool.db_type }}-backup" >> $GITHUB_OUTPUT
- name: Set up Docker Buildx
Expand Down Expand Up @@ -99,14 +100,14 @@ jobs:
enable=${{ matrix.db_tool.version != '' }},type=raw,value=${{ matrix.db_tool.db_type }}-${{ matrix.db_tool.version }}-${{ steps.package-json.outputs.major }}
enable=${{ matrix.db_tool.version != '' }},type=raw,value=${{ matrix.db_tool.db_type }}-${{ matrix.db_tool.version }}-${{ steps.package-json.outputs.major }}.${{ steps.package-json.outputs.minor }}
- name: Build and push container
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: .
file: ./docker/Dockerfile
platforms: linux/amd64
push: true
build-args: |
packageScope=${{ steps.pkg_meta.outputs.package_scope }}
packageFilter=${{ steps.pkg_meta.outputs.package_filter }}
packagePath=${{ steps.pkg_meta.outputs.package_path }}
dbType=${{ matrix.db_tool.db_type }}
dbToolVersion=${{ matrix.db_tool.version }}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/container-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@ jobs:
# awesome-mariadb-backup
# Valid versions can be found here https://dlm.mariadb.com/rest/releases/mariadb_server/
- db_type: mariadb
version: 10.5.28
version: 11.4.5
- db_type: mariadb
version: 10.6.21
version: 11.7.2
- db_type: mariadb
version: 10.11.11
version: 11.8.1
# awesome-file-backup
- db_type: file

Expand All @@ -63,7 +63,7 @@ jobs:
- name: Set up metadata
id: pkg_meta
run: |
echo "package_scope=@awesome-database-backup/awesome-${{ matrix.db_tool.db_type }}-backup" >> $GITHUB_OUTPUT
echo "package_filter=@awesome-database-backup/awesome-${{ matrix.db_tool.db_type }}-backup" >> $GITHUB_OUTPUT
echo "package_path=apps/awesome-${{ matrix.db_tool.db_type }}-backup" >> $GITHUB_OUTPUT
echo "package_image_name=weseek/awesome-${{ matrix.db_tool.db_type }}-backup" >> $GITHUB_OUTPUT
- name: Set up Docker Buildx
Expand All @@ -79,14 +79,14 @@ jobs:
${{ runner.os }}-buildx-app-${{ matrix.db_tool.db_type }}-
${{ runner.os }}-buildx-app-
- name: Build container (No push)
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: .
file: ./docker/Dockerfile
platforms: linux/amd64
load: true
build-args: |
packageScope=${{ steps.pkg_meta.outputs.package_scope }}
packageFilter=${{ steps.pkg_meta.outputs.package_filter }}
packagePath=${{ steps.pkg_meta.outputs.package_path }}
dbType=${{ matrix.db_tool.db_type }}
dbToolVersion=${{ matrix.db_tool.version }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/misc-command-bump_version.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
ref: ${{ github.head_ref }}
- uses: actions/setup-node@v4
with:
node-version: "16.14.2"
node-version-file: package.json
cache: "yarn"
- run: yarn install
- name: Bump up version
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-prepare_next_master.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
fetch-depth: 0
- uses: actions/setup-node@v4
with:
node-version: "16.14.2"
node-version-file: package.json
cache: "yarn"
- run: yarn install
- name: Bump up version
Expand Down
13 changes: 6 additions & 7 deletions .github/workflows/release-update_draft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,23 @@ jobs:
runs-on: ubuntu-latest

outputs:
RELEASE_VERSION: ${{ steps.package-json.outputs.packageVersion }}
RELEASE_VERSION: ${{ steps.package-json.outputs.full }}
RELEASE_DRAFT_BODY: ${{ steps.release-drafter.outputs.body }}

steps:
- uses: actions/checkout@v4

- name: Retrieve information from package.json
uses: myrotvorets/info-from-package-json-action@2.0.0
uses: xile611/read-package-version-action@v2.1
id: package-json

# Drafts your next Release notes as Pull Requests are merged into "master"
- uses: release-drafter/release-drafter@v6
id: release-drafter
with:
name: v${{ steps.package-json.outputs.packageVersion }}
tag: v${{ steps.package-json.outputs.packageVersion }}
version: ${{ steps.package-json.outputs.packageVersion }}
name: v${{ steps.package-json.outputs.full }}
tag: v${{ steps.package-json.outputs.full }}
version: ${{ steps.package-json.outputs.full }}
disable-autolabeler: true
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -46,9 +46,8 @@ jobs:
with:
fetch-depth: 0

# See: https://github.com/bakunyo/git-pr-release-action/issues/15, https://github.com/samunohito/SimpleVolumeMixer/commit/2059044c71236509466cf9b1bb2d56d515274938
- name: Create/Update Pull Request
uses: bakunyo/git-pr-release-action@281e1fe424fac01f3992542266805e4202a22fe0
uses: bakunyo/git-pr-release-action@v1.4
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GIT_PR_RELEASE_BRANCH_PRODUCTION: stable
Expand Down
10 changes: 5 additions & 5 deletions apps/awesome-file-backup/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@awesome-database-backup/awesome-file-backup",
"version": "0.2.8",
"version": "0.3.0",
"description": "Collection of CLI executable npm packages which backup data stored in a file system and store to Amazon S3 or Google Cloud Storage. You can set a custom S3 endpoint to use S3 based services like DigitalOcean Spaces instead of Amazon S3.",
"author": "Ryu Sato <[email protected]>",
"license": "MIT",
Expand All @@ -13,10 +13,10 @@
"url": "https://github.com/weseek/awesome-database-backup/issues"
},
"dependencies": {
"@awesome-database-backup/file-backup": "^0.2.8",
"@awesome-database-backup/file-restore": "^0.2.8",
"@awesome-database-backup/list": "^0.2.8",
"@awesome-database-backup/prune": "^0.2.8"
"@awesome-database-backup/file-backup": "^0.3.0",
"@awesome-database-backup/file-restore": "^0.3.0",
"@awesome-database-backup/list": "^0.3.0",
"@awesome-database-backup/prune": "^0.3.0"
},
"devDependencies": {}
}
10 changes: 5 additions & 5 deletions apps/awesome-mariadb-backup/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@awesome-database-backup/awesome-mariadb-backup",
"version": "0.2.8",
"version": "0.3.0",
"description": "Collection of scripts which backup MariaDB databases to Amazon S3 or Google Cloud Storage. You can set a custom S3 endpoint to use S3 based services like DigitalOcean Spaces instead of Amazon S3.",
"author": "Ryu Sato <[email protected]>",
"license": "MIT",
Expand All @@ -13,10 +13,10 @@
"url": "https://github.com/weseek/awesome-database-backup/issues"
},
"dependencies": {
"@awesome-database-backup/mariadb-backup": "^0.2.8",
"@awesome-database-backup/mariadb-restore": "^0.2.8",
"@awesome-database-backup/list": "^0.2.8",
"@awesome-database-backup/prune": "^0.2.8"
"@awesome-database-backup/mariadb-backup": "^0.3.0",
"@awesome-database-backup/mariadb-restore": "^0.3.0",
"@awesome-database-backup/list": "^0.3.0",
"@awesome-database-backup/prune": "^0.3.0"
},
"devDependencies": {}
}
10 changes: 5 additions & 5 deletions apps/awesome-mongodb-backup/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@awesome-database-backup/awesome-mongodb-backup",
"version": "0.2.8",
"version": "0.3.0",
"description": "Collection of scripts which backup MongoDB databases to Amazon S3 or Google Cloud Storage. You can set a custom S3 endpoint to use S3 based services like DigitalOcean Spaces instead of Amazon S3.",
"author": "Ryu Sato <[email protected]>",
"license": "MIT",
Expand All @@ -13,10 +13,10 @@
"url": "https://github.com/weseek/awesome-database-backup/issues"
},
"dependencies": {
"@awesome-database-backup/mongodb-backup": "^0.2.8",
"@awesome-database-backup/mongodb-restore": "^0.2.8",
"@awesome-database-backup/list": "^0.2.8",
"@awesome-database-backup/prune": "^0.2.8"
"@awesome-database-backup/mongodb-backup": "^0.3.0",
"@awesome-database-backup/mongodb-restore": "^0.3.0",
"@awesome-database-backup/list": "^0.3.0",
"@awesome-database-backup/prune": "^0.3.0"
},
"devDependencies": {}
}
10 changes: 5 additions & 5 deletions apps/awesome-postgresql-backup/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@awesome-database-backup/awesome-postgresql-backup",
"version": "0.2.8",
"version": "0.3.0",
"description": "Collection of scripts which backup PostgreSQL databases to Amazon S3 or Google Cloud Storage. You can set a custom S3 endpoint to use S3 based services like DigitalOcean Spaces instead of Amazon S3.",
"author": "Ryu Sato <[email protected]>",
"license": "MIT",
Expand All @@ -13,10 +13,10 @@
"url": "https://github.com/weseek/awesome-database-backup/issues"
},
"dependencies": {
"@awesome-database-backup/postgresql-backup": "^0.2.8",
"@awesome-database-backup/postgresql-restore": "^0.2.8",
"@awesome-database-backup/list": "^0.2.8",
"@awesome-database-backup/prune": "^0.2.8"
"@awesome-database-backup/postgresql-backup": "^0.3.0",
"@awesome-database-backup/postgresql-restore": "^0.3.0",
"@awesome-database-backup/list": "^0.3.0",
"@awesome-database-backup/prune": "^0.3.0"
},
"devDependencies": {}
}
Loading

0 comments on commit 9373627

Please sign in to comment.