Skip to content

Commit

Permalink
springboot version upgraded
Browse files Browse the repository at this point in the history
  • Loading branch information
jveverka committed Jan 22, 2022
1 parent ed1df0b commit ffaf0a4
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -121,27 +121,27 @@ Refer to [attached postman collection](docs/FileServer.postman_collection.json)
### Run in Docker
* Run with default configuration [application.yml](src/main/resources/application.yml) - only for demo purposes.
```
docker run -d --name file-server-1.2.1 \
docker run -d --name file-server-1.2.2 \
--restart unless-stopped \
-e SERVER_PORT=8888 \
-p 8888:8888 jurajveverka/file-server:1.2.1
-p 8888:8888 jurajveverka/file-server:1.2.2
```
* Run with custom configuration. Note that customized ``application.yml`` is located at ``${FS_CONFIG_DIR}/application.yml``
and ``fileserver.home`` points to ``/opt/data/files``
```
docker run -d --name file-server-1.2.1 \
docker run -d --name file-server-1.2.2 \
--restart unless-stopped \
-e SERVER_PORT=8888 \
-e APP_CONFIG_PATH=/opt/data/config/application.yml \
-v '${FS_CONFIG_DIR}':/opt/data/config \
-v '${FS_FILES_DIR}':/opt/data/files \
-p 8888:8888 jurajveverka/file-server:1.2.1
-p 8888:8888 jurajveverka/file-server:1.2.2
```
* Build your own [docker image for amd64 or arm64v8](docs/DockerBuild.md) platform.

### Build and Run
Variable ``fileserver.home`` in ``application.yml`` file defines *base directory* to be exposed via REST APIs.
```
gradle clean build test
java -jar build/libs/file-server-1.2.1-SNAPSHOT.jar --spring.config.location=file:./src/main/resources/application.yml
java -jar build/libs/file-server-1.2.2-SNAPSHOT.jar --spring.config.location=file:./src/main/resources/application.yml
```
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
plugins {
id 'org.springframework.boot' version '2.5.6'
id 'org.springframework.boot' version '2.6.2'
id 'io.spring.dependency-management' version '1.0.11.RELEASE'
id 'java'
}

group = 'itx.fileserver'
version = '1.2.1-SNAPSHOT'
version = '1.2.2-SNAPSHOT'

sourceCompatibility = 11
targetCompatibility = 11
Expand All @@ -18,7 +18,7 @@ repositories {
dependencies {
implementation('org.springframework.boot:spring-boot-starter-web')
testImplementation('org.springframework.boot:spring-boot-starter-test')
testImplementation('org.mockito:mockito-core:3.12.4')
testImplementation('org.mockito:mockito-core:4.2.0')
}

test {
Expand Down
2 changes: 1 addition & 1 deletion docs/DockerBuild.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Build and publish Dockers for x86_64 and ARM64
```
export VERSION=1.2.1
export VERSION=1.2.2
# on x86 AMD64 device:
docker build -t jurajveverka/file-server:${VERSION}-amd64 --build-arg ARCH=amd64 --file ./Dockerfile .
docker push jurajveverka/file-server:${VERSION}-amd64
Expand Down

0 comments on commit ffaf0a4

Please sign in to comment.