[PR #828] [MERGED] fix: rewrite how image env is merged #1633

Closed
opened 2026-03-01 21:52:01 +03:00 by kerem · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/nektos/act/pull/828
Author: @catthehacker
Created: 9/27/2021
Status: Merged
Merged: 9/27/2021
Merged by: @mergify[bot]

Base: masterHead: cat/fix/proper-env-merge


📝 Commits (3)

  • ccde10e fix: rewrite how image env is merged
  • 01dd4d5 test: add test for extractFromImageEnv
  • efd1156 Merge branch 'master' into cat/fix/proper-env-merge

📊 Changes

5 files changed (+83 additions, -62 deletions)

View changed files

📝 pkg/container/docker_run.go (+38 -40)
📝 pkg/container/docker_run_test.go (+34 -21)
pkg/container/testdata/Dockerfile (+5 -0)
📝 pkg/runner/run_context.go (+1 -0)
📝 pkg/runner/step_context.go (+5 -1)

📄 Description

This is a replacement for https://github.com/nektos/act/pull/771 since i'm dumb the previous PR just adds environment to container and doesn't fix anything.

fixes #827
fixes #757 (for real this time)
fixes #161


🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/nektos/act/pull/828 **Author:** [@catthehacker](https://github.com/catthehacker) **Created:** 9/27/2021 **Status:** ✅ Merged **Merged:** 9/27/2021 **Merged by:** [@mergify[bot]](https://github.com/apps/mergify) **Base:** `master` ← **Head:** `cat/fix/proper-env-merge` --- ### 📝 Commits (3) - [`ccde10e`](https://github.com/nektos/act/commit/ccde10e5f7ca69adb856d7f537ef3c33b2f98fd9) fix: rewrite how image env is merged - [`01dd4d5`](https://github.com/nektos/act/commit/01dd4d5ccd0f96e634452a0eeb7ee0ae8675fa9b) test: add test for extractFromImageEnv - [`efd1156`](https://github.com/nektos/act/commit/efd1156138541976dbf4a1b36f0e095cbc50a12e) Merge branch 'master' into cat/fix/proper-env-merge ### 📊 Changes **5 files changed** (+83 additions, -62 deletions) <details> <summary>View changed files</summary> 📝 `pkg/container/docker_run.go` (+38 -40) 📝 `pkg/container/docker_run_test.go` (+34 -21) ➕ `pkg/container/testdata/Dockerfile` (+5 -0) 📝 `pkg/runner/run_context.go` (+1 -0) 📝 `pkg/runner/step_context.go` (+5 -1) </details> ### 📄 Description This is a replacement for https://github.com/nektos/act/pull/771 since ~~i'm dumb~~ the previous PR just adds environment to container and doesn't fix anything. fixes #827 fixes #757 (for real this time) fixes #161 --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
kerem 2026-03-01 21:52:01 +03:00
Sign in to join this conversation.
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
starred/act#1633
No description provided.