@@ -17,53 +17,42 @@ RUN set -e; \
1717 libatk-bridge2.0-0 libatk1.0-0 libcups2 libdbus-1-3 \
1818 libgdk-pixbuf2.0-0 libnspr4 libnss3 libx11-xcb1 libxcomposite1 \
1919 libxdamage1 libxrandr2 libgbm1 libgtk-3-0 libxshmfence1 libxss1 libxtst6 \
20- --no-install-recommends; \
20+ --no-install-recommends; \g bm1 libgtk-3-0 libxshmfence1 libxss1 libxtst6 \
2121 ARCH=$(dpkg --print-architecture); \
2222 if [ "$ARCH" = "amd64" ]; then \
23- wget -O /tmp/google-chrome.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb; \
24- elif [ "$ARCH" = "arm64" ]; then \
25- wget -O /tmp/google-chrome.deb https://dl.google.com/linux/direct/google-chrome-stable_current_arm64.deb; \
26- else \
27- echo "Unsupported architecture: $ARCH" && exit 1; \
23+ wget -O /tmp/google-chrome.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb && \
24+ apt-get install -y /tmp/google-chrome.deb && \
25+ rm -f /tmp/google-chrome.deb && \
26+ google-chrome --version; \s tall -g lighthouse@11.1.0 && npm cache clean --force
27+ export CHROME_PATH=/usr/bin/google-chrome; \
28+ elif [ "$ARCH" = "arm64" ]; then \ dizinler
29+ apt-get install -y chromium-browser && \
30+ chromium-browser --version; \
31+ export CHROME_PATH=/usr/bin/chromium-browser; \t kullanıcı
32+ else \ -d /home/appuser appuser && \
33+ echo "Unsupported architecture: $ARCH" && exit 1; \ -R appuser:appuser /tmp/lighthouse /tmp/netty /home/appuser
2834 fi; \
29- if [ ! -f /tmp/google-chrome.deb ]; then \
30- echo "Chrome .deb not downloaded!" ; exit 1; \
31- fi; \
32- apt-get install -y /tmp/google-chrome.deb; \
33- rm -f /tmp/google-chrome.deb; \
34- rm -rf /var/lib/apt/lists/*; \
35- google-chrome --version
36-
37- # Lighthouse CLI yükle
35+ rm -rf /var/lib/apt/lists/*
36+ COPY --from=builder /app/target/*.jar /app/app.jar
37+ # Lighthouse CLI yükleser /app/app.jar
3838RUN npm install -g lighthouse@11.1.0 && npm cache clean --force
39-
40- # Gerekli dizinler
41- RUN mkdir -p /tmp/lighthouse /tmp/netty
39+ # Healthcheck script
40+ # Gerekli dizinlerh /app/healthcheck.sh
41+ RUN mkdir -p /tmp/lighthouse /tmp/nettywn appuser:appuser /app/healthcheck.sh
4242
4343# Non-root kullanıcı
4444RUN groupadd -r appuser && useradd -r -g appuser -d /home/appuser appuser && \
4545 mkdir -p /home/appuser && chown -R appuser:appuser /tmp/lighthouse /tmp/netty /home/appuser
46-
47- # JAR dosyasını kopyala
46+ CHROME_PATH=/usr/bin/chromium-browser \
47+ # JAR dosyasını kopyala_PATH=/usr/bin/chromium-browser \
4848COPY --from=builder /app/target/*.jar /app/app.jar
49- RUN chown appuser:appuser /app/app.jar
49+ RUN chown appuser:appuser /app/app.jarocal/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin "
5050
5151# Healthcheck script
5252COPY healthcheck.sh /app/healthcheck.sh
5353RUN chmod +x /app/healthcheck.sh && chown appuser:appuser /app/healthcheck.sh
5454
55- # Ortam değişkenleri
55+ # Ortam değişkenlerial=30s --timeout=10s --start-period=60s --retries=3 CMD [ " bash ", " /app/healthcheck.sh " ]
5656ENV JAVA_HOME=/opt/java/openjdk \
5757 NODE_PATH=/usr/local/lib/node_modules \
58- CHROME_PATH=/usr/bin/google-chrome \
59- LIGHTHOUSE_CHROMIUM_PATH=/usr/bin/google-chrome \
60- PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true \
61- PATH="/opt/java/openjdk/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
62-
63- USER appuser
64- WORKDIR /app
65- EXPOSE 8085
66-
67- HEALTHCHECK --interval=30s --timeout=10s --start-period=60s --retries=3 CMD [ "bash" , "/app/healthcheck.sh" ]
68-
69- CMD ["java" , "-jar" , "app.jar" ]
58+ CHROME_PATH=${CHROME_PATH:-/usr/bin/google-chrome} \ LIGHTHOUSE_CHROMIUM_PATH=${CHROME_PATH:-/usr/bin/google-chrome} \ PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true \ PATH=" /opt/java/openjdk/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"USER appuserWORKDIR /appEXPOSE 8085HEALTHCHECK --interval=30s --timeout=10s --start-period=60s --retries=3 CMD [ " bash", " /app/healthcheck.sh" ]CMD [" java", " -jar", " app.jar"]
0 commit comments