self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-11-27 08:21:03 +02:00
Code Issues Releases Activity

Revert "Tools: Switch Joplin Server image location to laurent22/joplin-server"

Browse Source 
This reverts commit 6729a3d51f.

Ref: https://discourse.joplinapp.org/t/docker-image-doesnt-exist/30103/5
This commit is contained in:
Laurent Cozic 2023-03-19 09:07:19 +00:00
parent d18a4be31f
commit f8cd1ba8e5
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/github-actions-main.yml vendored
View File

@ -97,7 +97,7 @@ jobs:
GH_TOKEN: ${{ secrets.GH_TOKEN }}
IS_CONTINUOUS_INTEGRATION: 1
BUILD_SEQUENCIAL: 1
SERVER_REPOSITORY: laurent22/joplin-server
SERVER_REPOSITORY: joplin/server
SERVER_TAG_PREFIX: server
run: |
"${GITHUB_WORKSPACE}/.github/scripts/run_ci.sh"
@ -122,7 +122,7 @@ jobs:
env:
IS_CONTINUOUS_INTEGRATION: 1
BUILD_SEQUENCIAL: 1
SERVER_REPOSITORY: laurent22/joplin-server
SERVER_REPOSITORY: joplin/server
SERVER_TAG_PREFIX: server
run: |
yarn install && cd packages/app-desktop && yarn run dist --publish=never
@ -166,8 +166,8 @@ jobs:
BUILD_SEQUENCIAL: 1
run: |
yarn install
yarn run buildServerDocker --tag-name server-v0.0.0 --repository laurent22/joplin-server
yarn run buildServerDocker --tag-name server-v0.0.0 --repository joplin/server
# Basic test to ensure that the created build is valid. It should exit with
# code 0 if it works.
docker run laurent22/joplin-server:0.0.0-beta node dist/app.js migrate list
docker run joplin/server:0.0.0-beta node dist/app.js migrate list

2
docker-compose.server.yml
View File

@ -30,7 +30,7 @@ services:
- POSTGRES_USER=${POSTGRES_USER}
- POSTGRES_DB=${POSTGRES_DATABASE}
app:
image: laurent22/joplin-server:latest
image: joplin/server:latest
depends_on:
- db
ports:

2
packages/server/README.md
View File

@ -12,7 +12,7 @@
3. Run the following command to test starting the server using the default configuration:
```shell
docker run --env-file .env -p 22300:22300 laurent22/joplin-server:latest
docker run --env-file .env -p 22300:22300 joplin/server:latest
```
The server will listen on port **22300** on **localhost**. By default, the server will use SQLite, which allows you to test the app without setting up a database. When running the server for production use, you should connect the container to a database, as described below.

6
packages/tools/tagServerLatest.ts
View File

@ -6,9 +6,9 @@ async function main() {
const version = argv._[0];
await execCommand2(`docker pull "laurent22/joplin-server:${version}"`);
await execCommand2(`docker tag "laurent22/joplin-server:${version}" "laurent22/joplin-server:latest"`);
await execCommand2('docker push laurent22/joplin-server:latest');
await execCommand2(`docker pull "joplin/server:${version}"`);
await execCommand2(`docker tag "joplin/server:${version}" "joplin/server:latest"`);
await execCommand2('docker push joplin/server:latest');
}
if (require.main === module) {