Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Improvement][Docker][K8s] support start with container #326

Merged
merged 2 commits into from
Dec 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion bin/datavines-daemon.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# limitations under the License.
#

usage="Usage: datavines-daemon.sh (start|stop) <''|mysql>"
usage="Usage: datavines-daemon.sh (start|start_container|stop) <''|mysql>"

# if no args specified, show usage
if [ $# -le 0 ]; then
Expand Down Expand Up @@ -91,6 +91,25 @@ case $startStop in
echo $! > $pid
;;

(start_container)
[ -w "$DATAVINES_PID_DIR" ] || mkdir -p "$DATAVINES_PID_DIR"

if [ -f $pid ]; then
if kill -0 `cat $pid` > /dev/null 2>&1; then
echo DataVinesServer running as process `cat $pid`. Stop it first.
exit 1
fi
fi

echo starting DataVinesServer, logging to $log

exec_command="$LOG_FILE $DATAVINES_OPTS -classpath $DATAVINES_CONF_DIR:$DATAVINES_LIB_JARS $CLASS"

echo "$JAVA_HOME/bin/java $exec_command"
$JAVA_HOME/bin/java $exec_command
echo $! > $pid
;;

(stop)

if [ -f $pid ]; then
Expand Down
5 changes: 5 additions & 0 deletions deploy/compose/.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
SPRING_PROFILES_ACTIVE=mysql
SPRING_DATASOURCE_URL=jdbc:mysql://127.0.0.1:3306/datavines?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
SPRING_DATASOURCE_USERNAME=root
SPRING_DATASOURCE_PASSWORD=123456
SPRING_DATASOURCE_DRIVER-CLASS_NAME=com.mysql.cj.jdbc.Driver
19 changes: 19 additions & 0 deletions deploy/compose/docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
version: '3.8'
services:
datavines:
image: datavines:dev
container_name: datavines
ports:
- 5600:5600
env_file: .env
privileged: true
restart: unless-stopped
networks:
- datavines

networks:
datavines:
driver: bridge
ipam:
config:
- subnet: 172.18.0.0/24
10 changes: 10 additions & 0 deletions deploy/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
FROM openjdk:8
LABEL "author"="735140144"
WORKDIR /datavines
COPY ./datavines-1.0.0-SNAPSHOT-bin.tar.gz /datavines
RUN tar -zxvf datavines-1.0.0-SNAPSHOT-bin.tar.gz
RUN chmod +x datavines-1.0.0-SNAPSHOT-bin/bin/datavines-daemon.sh
ENV TZ=Asia/Shanghai
ENV LANG=zh_CN.UTF-8
EXPOSE 5600
CMD ["datavines-1.0.0-SNAPSHOT-bin/bin/datavines-daemon.sh","start_container",""]
111 changes: 111 additions & 0 deletions deploy/k8s/datavines.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
---
apiVersion: apps/v1
kind: Deployment
metadata:
annotations: {}
labels:
k8s.kuboard.cn/layer: svc
k8s.kuboard.cn/name: datavines
name: datavines
namespace: bigdata
spec:
progressDeadlineSeconds: 600
replicas: 1
revisionHistoryLimit: 10
selector:
matchLabels:
k8s.kuboard.cn/layer: svc
k8s.kuboard.cn/name: datavines
strategy:
rollingUpdate:
maxSurge: 25%
maxUnavailable: 25%
type: RollingUpdate
template:
metadata:
creationTimestamp: null
labels:
k8s.kuboard.cn/layer: svc
k8s.kuboard.cn/name: datavines
spec:
containers:
- args:
- start_container
- ''
command:
- datavines-1.0.0-SNAPSHOT-bin/bin/datavines-daemon.sh
env:
- name: SPRING_PROFILES_ACTIVE
value: mysql
- name: SPRING_DATASOURCE_URL
value: >-
jdbc:mysql://mysql:3306/datavines?useSSL=false&useUnicode=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8
- name: SPRING_DATASOURCE_USERNAME
value: root
- name: SPRING_DATASOURCE_PASSWORD
value: 123456
image: 'registry.cn-shanghai.aliyuncs.com/luckydata/datavines:dev'
imagePullPolicy: IfNotPresent
name: datavines
resources: {}
securityContext:
allowPrivilegeEscalation: true
privileged: true
terminationMessagePath: /dev/termination-log
terminationMessagePolicy: File
dnsPolicy: ClusterFirst
restartPolicy: Always
schedulerName: default-scheduler
securityContext: {}
terminationGracePeriodSeconds: 30

---
apiVersion: v1
kind: Service
metadata:
annotations: {}
labels:
k8s.kuboard.cn/layer: svc
k8s.kuboard.cn/name: datavines
name: datavines
namespace: bigdata
spec:
internalTrafficPolicy: Cluster
ipFamilies:
- IPv4
ipFamilyPolicy: SingleStack
ports:
- name: web
port: 5600
protocol: TCP
targetPort: 5600
selector:
k8s.kuboard.cn/layer: svc
k8s.kuboard.cn/name: datavines
sessionAffinity: None
type: ClusterIP

---
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
annotations: {}
labels:
k8s.kuboard.cn/layer: svc
k8s.kuboard.cn/name: datavines
name: datavines
namespace: bigdata
spec:
ingressClassName: datavines
rules:
- host: www.datavines.com
http:
paths:
- backend:
service:
name: datavines
port:
number: 5600
path: /
pathType: Prefix

Loading