Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/release/2.5' into 2.5
Browse files Browse the repository at this point in the history
  • Loading branch information
hotlong committed Sep 27, 2023
2 parents 65f13bd + 3a5a855 commit 5020ebb
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 25 deletions.
30 changes: 9 additions & 21 deletions .github/workflows/release-docker-enterprise.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ on:
workflows: [Disabled-Release NPM]
types:
- completed
push:
branches:
- 'releases/**'

jobs:
docker:
Expand All @@ -17,25 +20,10 @@ jobs:
with:
fetch-depth: 0

- name: Get branch names
id: branch-name
uses: tj-actions/[email protected]
with:
strip_tag_prefix: v

- name: Get the current tag
if: steps.branch-name.outputs.is_tag == 'true' # Replaces: startsWith(github.ref, 'refs/tags/')
- name: Set Current Version
run: |
echo "${{ steps.branch-name.outputs.tag }}"
- uses: nowsprinting/check-version-format-action@v3
id: version
with:
prefix: 'v'

- name: Check is stable
if: ${{ steps.version.outputs.is_stable != 'true' }}
run: exit 0
CURRENT_VERSION=$(node -p 'require("./lerna.json").version')
echo "CURRENT_VERSION=${CURRENT_VERSION}" >> $GITHUB_ENV
- uses: docker/setup-qemu-action@v1
- uses: docker/setup-buildx-action@v1
Expand All @@ -52,9 +40,9 @@ jobs:
type=ref,event=branch
type=ref,event=pr
type=schedule
type=semver,pattern={{version}}
type=semver,pattern={{major}}.{{minor}}
type=semver,pattern={{major}}
type=semver,pattern={{version}},value=v${CURRENT_VERSION}
type=semver,pattern={{major}}.{{minor}},value=v${CURRENT_VERSION}
type=semver,pattern={{major}},value=v${CURRENT_VERSION}
- uses: docker/login-action@v1
name: Login Docker Hub
Expand Down
4 changes: 1 addition & 3 deletions deploy/enterprise/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@ RUN curl -fsSL https://pgp.mongodb.com/server-4.4.asc | \
RUN echo "deb [ signed-by=/usr/share/keyrings/mongodb-server-4.4.gpg ] http://repo.mongodb.org/apt/debian buster/mongodb-org/4.4 main" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list

RUN apt-get update \
&& apt-get install -y mongodb-org=4.4.24 mongodb-org-server=4.4.24 mongodb-org-shell=4.4.24 mongodb-org-mongos=4.4.24 mongodb-org-tools=4.4.24 \
&& apt-get autoremove --yes \
&& apt-get clean -y
&& apt-get install -y mongodb-org=4.4.24 mongodb-org-server=4.4.24 mongodb-org-shell=4.4.24 mongodb-org-mongos=4.4.24 mongodb-org-tools=4.4.24

# Install nginx && redis
RUN apt-get update \
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
],
"useWorkspaces": true,
"npmClient": "yarn",
"version": "2.5.15-beta.4"
"version": "2.5.15-beta.5"
}

0 comments on commit 5020ebb

Please sign in to comment.