Upgrade pulsar image for apple silicon (#15591)

Signed-off-by: Edward Zeng <jie.zeng@zilliz.com>
This commit is contained in:
edward.zeng 2022-02-16 19:13:49 +08:00 committed by GitHub
parent bf23bff150
commit de9ee84bbb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 133 additions and 1 deletions

View File

@ -0,0 +1,28 @@
FROM adoptopenjdk:11-jdk-hotspot
# Prepare environment
ENV PULSAR_HOME=/pulsar
ENV PATH=$PULSAR_HOME/bin:$PATH
RUN groupadd --system --gid=9999 pulsar && useradd --system --home-dir $PULSAR_HOME --uid=9999 --gid=pulsar pulsar
WORKDIR $PULSAR_HOME
ARG PULSAR_VERSION
ENV PULSAR_VERSION 2.8.2
# Install Pulsar
RUN set -ex; \
apt-get update && apt-get install -y wget; \
PULSAR_VERSION=$PULSAR_VERSION; \
wget -O pulsar.tgz "https://archive.apache.org/dist/pulsar/pulsar-${PULSAR_VERSION}/apache-pulsar-${PULSAR_VERSION}-bin.tar.gz"; \
tar -xf pulsar.tgz --strip-components=1; \
rm pulsar.tgz; \
\
chown -R pulsar:pulsar .;
COPY apply-config-from-env.py bin/
RUN apt-get update && apt-get install python3-pip python3 -y
EXPOSE 6650 8080
RUN python3 bin/apply-config-from-env.py conf/standalone.conf
CMD [ "bin/pulsar","standalone", "--no-functions-worker", "--no-stream-storage" ]

View File

@ -0,0 +1,104 @@
#!/usr/bin/env python
#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
#
##
## Edit a properties config file and replace values based on
## the ENV variables
## export my-key=new-value
## ./apply-config-from-env file.conf
##
import os, sys
if len(sys.argv) < 2:
print('Usage: %s' % (sys.argv[0]))
sys.exit(1)
# Always apply env config to env scripts as well
conf_files = sys.argv[1:]
PF_ENV_PREFIX = 'PULSAR_PREFIX_'
PF_ENV_DEBUG = (os.environ.get('PF_ENV_DEBUG','0') == '1')
for conf_filename in conf_files:
lines = [] # List of config file lines
keys = {} # Map a key to its line number in the file
# Load conf file
for line in open(conf_filename):
lines.append(line)
line = line.strip()
if not line:
continue
try:
k,v = line.split('=', 1)
if k.startswith('#'):
k = k[1:]
keys[k.strip()] = len(lines) - 1
except:
if PF_ENV_DEBUG:
print("[%s] skip Processing %s" % (conf_filename, line))
# Update values from Env
for k in sorted(os.environ.keys()):
v = os.environ[k].strip()
# Hide the value in logs if is password.
if "password" in k:
displayValue = "********"
else:
displayValue = v
if k.startswith(PF_ENV_PREFIX):
k = k[len(PF_ENV_PREFIX):]
if k in keys:
print('[%s] Applying config %s = %s' % (conf_filename, k, displayValue))
idx = keys[k]
lines[idx] = '%s=%s\n' % (k, v)
# Add new keys from Env
for k in sorted(os.environ.keys()):
v = os.environ[k]
if not k.startswith(PF_ENV_PREFIX):
continue
# Hide the value in logs if is password.
if "password" in k:
displayValue = "********"
else:
displayValue = v
k = k[len(PF_ENV_PREFIX):]
if k not in keys:
print('[%s] Adding config %s = %s' % (conf_filename, k, displayValue))
lines.append('%s=%s\n' % (k, v))
else:
print('[%s] Updating config %s = %s' % (conf_filename, k, displayValue))
lines[keys[k]] = '%s=%s\n' % (k, v)
# Store back the updated config in the same file
f = open(conf_filename, 'w')
for line in lines:
f.write(line)
f.close()

View File

@ -12,7 +12,7 @@ services:
- "4001:4001"
pulsar:
image: milvusdb/pulsar:v2.7.3-m1
image: milvusdb/pulsar:v2.8.2-m1
volumes:
- ${DOCKER_VOLUME_DIRECTORY:-.}/volumes/pulsar:/pulsar/data
environment: