Skip to content

Commit 5b06d6e

Browse files
authored
Merge pull request #106 from deploystackio/frontend-feat/credentials
Frontend feat/credentials
2 parents 890d417 + 1914f1b commit 5b06d6e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+7940
-1934
lines changed

.github/workflows/backend-release-pr.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,11 @@ jobs:
7070
TYPE_ARG: ${{ fromJSON('{"patch":"patch", "minor":"minor", "major":"major"}')[github.event.inputs.type] }}
7171
BETA_ARG: ${{ github.event.inputs.beta == 'true' && '--preRelease=beta' || '' }}
7272
run: npm run release -- $TYPE_ARG --ci --verbose --no-git.push --no-git.commit --no-git.tag --no-github $BETA_ARG
73+
- name: Update version.ts file
74+
working-directory: services/backend
75+
run: |
76+
node scripts/update-version.js
77+
git add src/config/version.ts
7378
- name: get-npm-version
7479
id: package-version
7580
uses: martinbeentjes/npm-get-version-action@main
@@ -138,8 +143,6 @@ jobs:
138143
- `linux/amd64` (Intel/AMD)
139144
- `linux/arm64` (Apple Silicon, AWS Graviton)
140145
141-
### Environment Variables
142-
The Docker image will include `DEPLOYSTACK_BACKEND_VERSION` environment variable set to the current version.
143146
144147
## Release notes:
145148
${{ steps.extract-release-notes.outputs.release_notes }}

.github/workflows/backend-release.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,5 @@ jobs:
8686
tags: |
8787
deploystack/backend:latest
8888
deploystack/backend:v${{ steps.package-version.outputs.current-version }}
89-
build-args: |
90-
DEPLOYSTACK_BACKEND_VERSION=${{ steps.package-version.outputs.current-version }}
9189
cache-from: type=gha
92-
cache-to: type=gha,mode=max
90+
cache-to: type=gha,mode=max

services/backend/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Production image
22
FROM node:23-alpine
33

4-
ARG DEPLOYSTACK_BACKEND_VERSION
54
WORKDIR /app
65

76
# Copy package files
@@ -22,8 +21,7 @@ RUN mkdir -p /app/data
2221

2322
# Create a default .env file
2423
RUN echo "NODE_ENV=production" > .env && \
25-
echo "PORT=3000" >> .env && \
26-
echo "DEPLOYSTACK_BACKEND_VERSION=${DEPLOYSTACK_BACKEND_VERSION:-$(node -e "console.log(require('./package.json').version)")}" >> .env
24+
echo "PORT=3000" >> .env
2725

2826
EXPOSE 3000
2927
CMD ["node", "--env-file=.env", "dist/index.js"]

0 commit comments

Comments
 (0)