Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit301c60d

Browse files
authored
chore(dogfood): add fish and helix ppa packages to dogfood (#12568)
1 parent096d472 commit301c60d

File tree

6 files changed

+78
-51
lines changed

6 files changed

+78
-51
lines changed

‎dogfood/Dockerfile

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -96,73 +96,74 @@ COPY files /
9696
ARG DEBIAN_FRONTEND="noninteractive"
9797

9898
RUN apt-get update --quiet && apt-get install --yes \
99+
ansible \
99100
apt-transport-https \
100101
apt-utils \
102+
asciinema \
101103
bash \
102104
bash-completion \
103105
bats \
104106
bind9-dnsutils \
105107
build-essential \
106108
ca-certificates \
109+
cargo \
107110
cmake \
111+
containerd.io \
108112
crypto-policies \
109113
curl \
114+
docker-ce \
115+
docker-ce-cli \
116+
docker-compose-plugin \
110117
fd-find \
111118
file \
119+
fish \
120+
gettext-base \
112121
git \
113122
gnupg \
123+
google-cloud-sdk \
124+
google-cloud-sdk-datastore-emulator \
114125
graphviz \
126+
helix \
115127
htop \
116128
httpie \
117129
inetutils-tools \
118130
iproute2 \
119131
iputils-ping \
120132
iputils-tracepath \
121133
jq \
134+
kubectl \
122135
language-pack-en \
123136
less \
137+
libssl-dev \
124138
lsb-release \
125139
man \
126140
meld \
141+
ncdu \
142+
neovim \
127143
net-tools \
128144
openjdk-11-jdk-headless \
129145
openssh-server \
130146
openssl \
131-
libssl-dev \
147+
packer \
132148
pkg-config \
149+
postgresql-13 \
133150
python3 \
134151
python3-pip \
135152
rsync \
153+
screen \
136154
shellcheck \
137155
strace \
138156
sudo \
139157
tcptraceroute \
140158
termshark \
141159
traceroute \
160+
unzip \
142161
vim \
143162
wget \
144163
xauth \
145164
zip \
146-
ncdu \
147-
cargo \
148-
asciinema \
149165
zsh \
150-
ansible \
151-
neovim \
152-
google-cloud-sdk \
153-
google-cloud-sdk-datastore-emulator \
154-
kubectl \
155-
postgresql-13 \
156-
containerd.io \
157-
docker-ce \
158-
docker-ce-cli \
159-
docker-compose-plugin \
160-
packer \
161-
fish \
162-
unzip \
163-
zstd \
164-
screen \
165-
gettext-base && \
166+
zstd && \
166167
# Delete package cache to avoid consuming space in layer
167168
apt-get clean && \
168169
# Configure FIPS-compliant policies

‎dogfood/files/etc/apt/preferences.d/ppa

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,21 @@ Package: ansible-base
88
Pin: origin ppa.launchpad.net
99
Pin-Priority: 500
1010

11+
# Fish
12+
Package: fish
13+
Pin: origin ppa.launchpad.net
14+
Pin-Priority: 500
15+
16+
# Git
17+
Package: git
18+
Pin: origin ppa.launchpad.net
19+
Pin-Priority: 500
20+
21+
# Helix
22+
Package: helix
23+
Pin: origin ppa.launchpad.net
24+
Pin-Priority: 500
25+
1126
# Neovim
1227
Package: neovim
1328
Pin: origin ppa.launchpad.net
@@ -17,8 +32,3 @@ Pin-Priority: 500
1732
Package: neovim-runtime
1833
Pin: origin ppa.launchpad.net
1934
Pin-Priority: 500
20-
21-
# Git
22-
Package: git
23-
Pin: origin ppa.launchpad.net
24-
Pin-Priority: 500
Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
11
deb [signed-by=/usr/share/keyrings/ansible.gpg] https://ppa.launchpadcontent.net/ansible/ansible/ubuntu jammy main
2-
deb [signed-by=/usr/share/keyrings/neovim.gpg] https://ppa.launchpadcontent.net/neovim-ppa/stable/ubuntu jammy main
2+
3+
deb [signed-by=/usr/share/keyrings/fish-shell.gpg] https://ppa.launchpadcontent.net/fish-shell/release-3/ubuntu/ jammy main
4+
35
deb [signed-by=/usr/share/keyrings/git-core.gpg] https://ppa.launchpadcontent.net/git-core/ppa/ubuntu jammy main
6+
7+
deb [signed-by=/usr/share/keyrings/helix.gpg] https://ppa.launchpadcontent.net/maveonair/helix-editor/ubuntu/ jammy main
8+
9+
deb [signed-by=/usr/share/keyrings/neovim.gpg] https://ppa.launchpadcontent.net/neovim-ppa/stable/ubuntu jammy main
371 Bytes
Binary file not shown.
1.13 KB
Binary file not shown.

‎dogfood/update-keys.sh

Lines changed: 35 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -16,51 +16,61 @@ gpg_flags=(
1616
)
1717

1818
pushd"$PROJECT_ROOT/dogfood/files/usr/share/keyrings"
19+
20+
# Ansible PPA signing key
21+
curl"${curl_flags[@]}""https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x6125e2a8c77f2818fb7bd15b93c4a3fd7bb9c367"|
22+
gpg"${gpg_flags[@]}" --output="ansible.gpg"
23+
1924
# Upstream Docker signing key
2025
curl"${curl_flags[@]}""https://download.docker.com/linux/ubuntu/gpg"|
2126
gpg"${gpg_flags[@]}" --output="docker.gpg"
2227

23-
# Google Cloud signing key
24-
curl"${curl_flags[@]}""https://packages.cloud.google.com/apt/doc/apt-key.gpg"|
25-
gpg"${gpg_flags[@]}" --output="google-cloud.gpg"
28+
# Fish signing key
29+
curl"${curl_flags[@]}""https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x59fda1ce1b84b3fad89366c027557f056dc33ca5"|
30+
gpg"${gpg_flags[@]}" --output="fish-shell.gpg"
31+
32+
# Git-Core signing key
33+
curl"${curl_flags[@]}""https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xE1DD270288B4E6030699E45FA1715D88E1DF1F24"|
34+
gpg"${gpg_flags[@]}" --output="git-core.gpg"
35+
36+
# GitHub CLI signing key
37+
curl"${curl_flags[@]}""https://cli.github.com/packages/githubcli-archive-keyring.gpg"|
38+
gpg"${gpg_flags[@]}" --output="github-cli.gpg"
2639

2740
# Google Linux Software repository signing key (Chrome)
2841
curl"${curl_flags[@]}""https://dl.google.com/linux/linux_signing_key.pub"|
2942
gpg"${gpg_flags[@]}" --output="google-chrome.gpg"
3043

44+
# Google Cloud signing key
45+
curl"${curl_flags[@]}""https://packages.cloud.google.com/apt/doc/apt-key.gpg"|
46+
gpg"${gpg_flags[@]}" --output="google-cloud.gpg"
47+
48+
# Hashicorp signing key
49+
curl"${curl_flags[@]}""https://apt.releases.hashicorp.com/gpg"|
50+
gpg"${gpg_flags[@]}" --output="hashicorp.gpg"
51+
52+
# Helix signing key
53+
curl"${curl_flags[@]}""https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x27642b9fd7f1a161fc2524e3355a4fa515d7c855"|
54+
gpg"${gpg_flags[@]}" --output="helix.gpg"
55+
3156
# Microsoft repository signing key (Edge)
3257
curl"${curl_flags[@]}""https://packages.microsoft.com/keys/microsoft.asc"|
3358
gpg"${gpg_flags[@]}" --output="microsoft.gpg"
3459

35-
#Upstream PostgreSQL signing key
36-
curl"${curl_flags[@]}""https://www.postgresql.org/media/keys/ACCC4CF8.asc"|
37-
gpg"${gpg_flags[@]}" --output="postgresql.gpg"
60+
#Neovim signing key
61+
curl"${curl_flags[@]}""https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x9dbb0be9366964f134855e2255f96fcf8231b6dd"|
62+
gpg"${gpg_flags[@]}" --output="neovim.gpg"
3863

3964
# NodeSource signing key
4065
curl"${curl_flags[@]}""https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key"|
4166
gpg"${gpg_flags[@]}" --output="nodesource.gpg"
4267

68+
# Upstream PostgreSQL signing key
69+
curl"${curl_flags[@]}""https://www.postgresql.org/media/keys/ACCC4CF8.asc"|
70+
gpg"${gpg_flags[@]}" --output="postgresql.gpg"
71+
4372
# Yarnpkg signing key
4473
curl"${curl_flags[@]}""https://dl.yarnpkg.com/debian/pubkey.gpg"|
4574
gpg"${gpg_flags[@]}" --output="yarnpkg.gpg"
4675

47-
# Ansible PPA signing key
48-
curl"${curl_flags[@]}""https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x6125e2a8c77f2818fb7bd15b93c4a3fd7bb9c367"|
49-
gpg"${gpg_flags[@]}" --output="ansible.gpg"
50-
51-
# Neovim signing key
52-
curl"${curl_flags[@]}""https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x9dbb0be9366964f134855e2255f96fcf8231b6dd"|
53-
gpg"${gpg_flags[@]}" --output="neovim.gpg"
54-
55-
# Hashicorp signing key
56-
curl"${curl_flags[@]}""https://apt.releases.hashicorp.com/gpg"|
57-
gpg"${gpg_flags[@]}" --output="hashicorp.gpg"
58-
59-
# GitHub CLI signing key
60-
curl"${curl_flags[@]}""https://cli.github.com/packages/githubcli-archive-keyring.gpg"|
61-
gpg"${gpg_flags[@]}" --output="github-cli.gpg"
62-
63-
# Git-Core signing key
64-
curl"${curl_flags[@]}""https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xE1DD270288B4E6030699E45FA1715D88E1DF1F24"|
65-
gpg"${gpg_flags[@]}" --output="git-core.gpg"
6676
popd

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp