Skip to content

Commit 22c0f48

Browse files
authoredMar 13, 2023
Merge pull request #10 from onegin/master
fixed patch and name
2 parents 767ad2e + bc01b73 commit 22c0f48

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed
 

‎Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
FROM openjdk:8-stretch
22

3+
34
LABEL maintainer="haxqer <haxqer666@gmail.com>" version="7.19.6"
45

56
ARG ATLASSIAN_PRODUCTION=confluence
@@ -31,4 +32,4 @@ RUN mkdir -p ${CONFLUENCE_INSTALL} ${CONFLUENCE_HOME} ${AGENT_PATH} ${CONFLUENCE
3132
WORKDIR $CONFLUENCE_INSTALL
3233
EXPOSE 8090
3334

34-
ENTRYPOINT ["/opt/confluence/bin/start-confluence.sh", "-fg"]
35+
ENTRYPOINT ["/opt/confluence/bin/start-confluence.sh", "-fg"]

‎README.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ default port: 8090
1313
- start confluence & mysql
1414

1515
```
16-
git clone https://github.com/haxqer/confluence.git \
16+
git clone https://github.com/onegin/confluence.git \
1717
&& cd confluence \
1818
&& docker-compose up
1919
```
@@ -51,9 +51,9 @@ default port: 8090
5151
```
5252
docker exec confluence-srv java -jar /var/agent/atlassian-agent.jar \
5353
-p conf \
54-
-m haxqer666@gmail.com \
55-
-n haxqer666@gmail.com \
56-
-o http://website \
54+
-m Hello@world.com \
55+
-n Hello@world.com \
56+
-o Name You Org \
5757
-s you-server-id-xxxx
5858
```
5959

@@ -67,9 +67,9 @@ docker exec confluence-srv java -jar /var/agent/atlassian-agent.jar \
6767
```
6868
docker exec confluence-srv java -jar /var/agent/atlassian-agent.jar \
6969
-p eu.softwareplant.biggantt \
70-
-m haxqer666@gmail.com \
71-
-n haxqer666@gmail.com \
72-
-o http://website \
70+
-m Hello@world.com \
71+
-n Hello@world.com \
72+
-o Name You Org \
7373
-s you-server-id-xxxx
7474
```
7575

@@ -79,7 +79,7 @@ docker exec confluence-srv java -jar /var/agent/atlassian-agent.jar \
7979

8080
```shell
8181
cd confluence && git pull
82-
docker pull haxqer/confluence:latest && docker-compose stop
82+
docker pull onegin/confluence:latest && docker-compose stop
8383
docker-compose rm
8484
```
8585

0 commit comments

Comments
 (0)
Please sign in to comment.