Skip to content

Commit e40b603

Browse files
committed
.
1 parent 7bde4c8 commit e40b603

File tree

3 files changed

+20
-20
lines changed

3 files changed

+20
-20
lines changed

.github/workflows/qemu-image-build.yml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -126,24 +126,24 @@ jobs:
126126
docker push "$REGISTRY/$REPOSITORY:$IMAGE_TAG"
127127
128128
# TODO (darora): temporarily also push to prod account from here - add a guard to only publish proper tagged releases to prod?
129-
- name: configure aws credentials - prod
130-
uses: aws-actions/configure-aws-credentials@v4
131-
with:
132-
role-to-assume: ${{ secrets.CONTROL_PLANE_PROD_ROLE }}
133-
aws-region: "us-east-1"
134-
135-
- name: Login to Amazon ECR
136-
id: login-ecr-private-prod
137-
uses: aws-actions/amazon-ecr-login@v2
138-
139-
- name: Push docker image to Amazon ECR
140-
env:
141-
REGISTRY: 156470330064.dkr.ecr.us-east-1.amazonaws.com
142-
REPOSITORY: postgres-vm-image
143-
IMAGE_TAG: ${{ steps.process_release_version.outputs.version }}
144-
run: |
145-
docker tag "postgres:$IMAGE_TAG" "$REGISTRY/$REPOSITORY:$IMAGE_TAG"
146-
docker push "$REGISTRY/$REPOSITORY:$IMAGE_TAG"
129+
# - name: configure aws credentials - prod
130+
# uses: aws-actions/configure-aws-credentials@v4
131+
# with:
132+
# role-to-assume: ${{ secrets.CONTROL_PLANE_PROD_ROLE }}
133+
# aws-region: "us-east-1"
134+
135+
# - name: Login to Amazon ECR
136+
# id: login-ecr-private-prod
137+
# uses: aws-actions/amazon-ecr-login@v2
138+
139+
# - name: Push docker image to Amazon ECR
140+
# env:
141+
# REGISTRY: 156470330064.dkr.ecr.us-east-1.amazonaws.com
142+
# REPOSITORY: postgres-vm-image
143+
# IMAGE_TAG: ${{ steps.process_release_version.outputs.version }}
144+
# run: |
145+
# docker tag "postgres:$IMAGE_TAG" "$REGISTRY/$REPOSITORY:$IMAGE_TAG"
146+
# docker push "$REGISTRY/$REPOSITORY:$IMAGE_TAG"
147147

148148
- name: Cleanup resources after build
149149
if: ${{ always() }}

qemu-arm64-nix.pkr.hcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ source "qemu" "cloudimg" {
8484
["-device", "virtio-gpu-pci"],
8585
["-drive", "if=pflash,format=raw,id=ovmf_code,readonly=on,file=/usr/share/AAVMF/AAVMF_CODE.fd"],
8686
["-drive", "if=pflash,format=raw,id=ovmf_vars,file=AAVMF_VARS.fd"],
87-
["-drive", "file=output-cloudimg/packer-cloudimg,format=qcow2"],
87+
["-drive", "file=output-cloudimg/packer-cloudimg,format=qcow2,unmap=discard,detect-zeroes=unmap"],
8888
["-drive", "file=seeds-cloudimg.iso,format=raw"],
8989
["--enable-kvm"]
9090
]

scripts/90-cleanup-qemu.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ elif [ -n "$(command -v apt-get)" ]; then
4848

4949
apt remove -y --purge libc6-dev linux-libc-dev libevent-dev libpcre3-dev libsystemd-dev packagekit multipath-tools unattended-upgrades plymouth gnupg open-vm-tools xauth lxd-installer publicsuffix libclang-cpp18 python3-twisted python-babel-localedata libicu74 python3-pygments fonts-dejavu* python3-botocore
5050

51-
5251
# remove old kernels
5352
CURRENT_KERNEL="$(uname -r | sed 's/-generic//')"
5453
INSTALLED_KERNELS=$(dpkg -l | awk '{print $2}' | grep -Eo 'linux-(image|headers|modules|tools)-[0-9]+' | sed -E 's/linux-(image|headers|modules|tools)-//' | sort -Vu)
@@ -82,3 +81,4 @@ chmod 600 /etc/ssh/revoked_keys
8281

8382
cat /dev/null > /var/log/lastlog
8483
cat /dev/null > /var/log/wtmp
84+
fstrim /

0 commit comments

Comments
 (0)