Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
Metabase
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Engineering Digital Service
Metabase
Commits
c6293fee
Unverified
Commit
c6293fee
authored
1 year ago
by
Nemanja Glumac
Committed by
GitHub
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
Revert "Add fonts in Dockerfile to fix pulses (#31764)" (#35735)
This reverts commit
44de976d
.
parent
a5b5bd21
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
Dockerfile
+1
-1
1 addition, 1 deletion
Dockerfile
bin/docker/Dockerfile
+1
-1
1 addition, 1 deletion
bin/docker/Dockerfile
bin/docker/Dockerfile_ubuntu
+1
-1
1 addition, 1 deletion
bin/docker/Dockerfile_ubuntu
with
3 additions
and
3 deletions
Dockerfile
+
1
−
1
View file @
c6293fee
...
...
@@ -33,7 +33,7 @@ FROM --platform=linux/amd64 eclipse-temurin:11-jre-alpine as runner
ENV
FC_LANG en-US LC_CTYPE en_US.UTF-8
# dependencies
RUN
apk add
-U
bash fontconfig curl
font-noto font-noto-arabic font-noto-hebrew font-noto-cjk
java-cacerts
&&
\
RUN
apk add
-U
bash
ttf-dejavu
fontconfig curl java-cacerts
&&
\
apk upgrade
&&
\
rm
-rf
/var/cache/apk/
*
&&
\
mkdir
-p
/app/certs
&&
\
...
...
This diff is collapsed.
Click to expand it.
bin/docker/Dockerfile
+
1
−
1
View file @
c6293fee
...
...
@@ -3,7 +3,7 @@ FROM --platform=linux/amd64 eclipse-temurin:11-jre-alpine
ENV
FC_LANG=en-US LC_CTYPE=en_US.UTF-8
# dependencies
RUN
apk add
-U
bash fontconfig curl
font-noto font-noto-arabic font-noto-hebrew font-noto-cjk
java-cacerts
&&
\
RUN
apk add
-U
bash
ttf-dejavu
fontconfig curl java-cacerts
&&
\
apk upgrade
&&
\
rm
-rf
/var/cache/apk/
*
&&
\
mkdir
-p
/app/certs
&&
\
...
...
This diff is collapsed.
Click to expand it.
bin/docker/Dockerfile_ubuntu
+
1
−
1
View file @
c6293fee
...
...
@@ -5,7 +5,7 @@ ENV FC_LANG=en-US LC_CTYPE=en_US.UTF-8
# Dependencies
RUN apt-get update && \
apt-get upgrade -y && \
apt-get install -y ca-certificates ca-certificates-java fonts-
noto fonts-noto-arabic fonts-noto-hebrew fonts-noto-cjk
&& \
apt-get install -y ca-certificates ca-certificates-java fonts-
dejavu
&& \
apt-get clean && \
curl https://s3.amazonaws.com/rds-downloads/rds-combined-ca-bundle.pem -o /usr/local/share/ca-certificates/rds-combined-ca-bundle.pem && \
curl https://cacerts.digicert.com/DigiCertGlobalRootG2.crt.pem -o /usr/local/share/ca-certificates/DigiCertGlobalRootG2.crt.pem && \
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment